aboutsummaryrefslogtreecommitdiffstats
path: root/packages/order-watcher
diff options
context:
space:
mode:
authorJacob Evans <dekz@dekz.net>2018-07-02 09:21:16 +0800
committerGitHub <noreply@github.com>2018-07-02 09:21:16 +0800
commitad570b8ae162a213b4b88c417ecd64d4661df18b (patch)
treed9acfb9e2459c4dfcac191061fefebe015ff5771 /packages/order-watcher
parentb9165c03af40983d885af2b18e729f11746de91d (diff)
parentb9b00e10d39c3c84bc72892ef37f1313e904414d (diff)
downloaddexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.gz
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.bz2
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.lz
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.xz
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.tar.zst
dexon-sol-tools-ad570b8ae162a213b4b88c417ecd64d4661df18b.zip
Merge branch 'v2-prototype' into eth-lightwallet-subprovider-final
Diffstat (limited to 'packages/order-watcher')
-rw-r--r--packages/order-watcher/CHANGELOG.json8
-rw-r--r--packages/order-watcher/package.json4
-rw-r--r--packages/order-watcher/test/global_hooks.ts2
3 files changed, 11 insertions, 3 deletions
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index 4afd4b9b5..00f6ad1b9 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,13 @@
[
{
+ "version": "0.0.7",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1529397769,
"version": "0.0.6",
"changes": [
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 6cee9da16..3335713a3 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/order-watcher",
- "version": "0.0.6",
+ "version": "0.0.7",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -85,7 +85,7 @@
"@0xproject/order-utils": "^0.0.7",
"@0xproject/types": "^0.8.1",
"@0xproject/typescript-typings": "^0.4.1",
- "@0xproject/utils": "^0.7.1",
+ "@0xproject/utils": "^0.7.3",
"@0xproject/web3-wrapper": "^0.7.1",
"ethereum-types": "^0.0.1",
"bintrees": "^1.0.2",
diff --git a/packages/order-watcher/test/global_hooks.ts b/packages/order-watcher/test/global_hooks.ts
index 9d6903af5..30b0cd697 100644
--- a/packages/order-watcher/test/global_hooks.ts
+++ b/packages/order-watcher/test/global_hooks.ts
@@ -6,7 +6,7 @@ import { provider } from './utils/web3_wrapper';
before('migrate contracts', async function(): Promise<void> {
// HACK: Since the migrations take longer then our global mocha timeout limit
// we manually increase it for this before hook.
- const mochaTestTimeoutMs = 20000;
+ const mochaTestTimeoutMs = 25000;
this.timeout(mochaTestTimeoutMs);
const txDefaults = {
gas: devConstants.GAS_LIMIT,