aboutsummaryrefslogtreecommitdiffstats
path: root/packages/order-watcher
diff options
context:
space:
mode:
authorBrandon Millman <brandon.millman@gmail.com>2018-11-14 03:38:20 +0800
committerBrandon Millman <brandon.millman@gmail.com>2018-11-14 03:38:20 +0800
commit3a3fe0e69acdc3a7aac16c4a64054d71a0689279 (patch)
tree1a394dd9c9db95ccba548688e62d9266c0774324 /packages/order-watcher
parentbaba78f545110c469e3ac1d29d9f3e89586597ca (diff)
parent5c21d3f6af2ffc513b2bbfe92abf99181a32ceca (diff)
downloaddexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.gz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.bz2
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.lz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.xz
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.tar.zst
dexon-sol-tools-3a3fe0e69acdc3a7aac16c4a64054d71a0689279.zip
Merge branch 'development' into fix/asset-buyer/price-per-token
* development: Publish Updated CHANGELOGS Fix a bug when undefined was been tried to convert to an array feat(instant): add extra asset metadata chore: fix linter error Improve logo spacing fix: lowercase supplied address before comparing with derived addresses (which are not checksummed) Remove unused instance variable update yarn.lock Increase logo size Replace remaining scroll-links with Link component Adjust paddin Fix menuItem background colors depending on the context Remove "Home" menu item, instead make different parts of logo link to different sections of the website Rename tutorial to match verb structure chore: Make `External exports` clickable on sidebar style: reduce border size on version dropdown style: make line-height of sidebar title 26px, make sure still bottom aligned with version picker Update yarn.lock style: remove small gap under topbar
Diffstat (limited to 'packages/order-watcher')
-rw-r--r--packages/order-watcher/CHANGELOG.json7
-rw-r--r--packages/order-watcher/CHANGELOG.md5
-rw-r--r--packages/order-watcher/package.json18
-rw-r--r--packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts2
4 files changed, 21 insertions, 11 deletions
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index dbb4824fc..7119d7953 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -5,8 +5,13 @@
{
"note": "Start jsonRpcRequestId at 1, not 0 as 0 breaks the web3.js websocket RPC provider",
"pr": 1227
+ },
+ {
+ "note":
+ "Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event"
}
- ]
+ ],
+ "timestamp": 1542134075
},
{
"timestamp": 1542028948,
diff --git a/packages/order-watcher/CHANGELOG.md b/packages/order-watcher/CHANGELOG.md
index 1470b0e48..018a0d206 100644
--- a/packages/order-watcher/CHANGELOG.md
+++ b/packages/order-watcher/CHANGELOG.md
@@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v2.2.3 - _November 13, 2018_
+
+ * Start jsonRpcRequestId at 1, not 0 as 0 breaks the web3.js websocket RPC provider (#1227)
+ * Fix the bug when order watcher was trying to convert undefined to an object in case of CancelUpTo event
+
## v2.2.2 - _November 12, 2018_
* Dependencies updated
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 6bb1ef485..2bab37908 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/order-watcher",
- "version": "2.2.2",
+ "version": "2.2.3",
"description": "An order watcher daemon that watches for order validity",
"keywords": [
"0x",
@@ -33,8 +33,8 @@
"node": ">=6.0.0"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.15",
- "@0x/migrations": "^2.0.2",
+ "@0x/dev-utils": "^1.0.16",
+ "@0x/migrations": "^2.0.3",
"@0x/tslint-config": "^1.0.10",
"@types/bintrees": "^1.0.2",
"@types/lodash": "4.14.104",
@@ -57,19 +57,19 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/abi-gen-wrappers": "^1.0.3",
+ "@0x/abi-gen-wrappers": "^1.0.4",
"@0x/assert": "^1.0.16",
- "@0x/base-contract": "^3.0.4",
+ "@0x/base-contract": "^3.0.5",
"@0x/contract-addresses": "^1.1.0",
"@0x/contract-artifacts": "^1.1.0",
- "@0x/contract-wrappers": "^4.0.0",
- "@0x/fill-scenarios": "^1.0.10",
+ "@0x/contract-wrappers": "^4.0.1",
+ "@0x/fill-scenarios": "^1.0.11",
"@0x/json-schemas": "^2.1.0",
- "@0x/order-utils": "^3.0.0",
+ "@0x/order-utils": "^3.0.1",
"@0x/types": "^1.2.1",
"@0x/typescript-typings": "^3.0.4",
"@0x/utils": "^2.0.4",
- "@0x/web3-wrapper": "^3.1.2",
+ "@0x/web3-wrapper": "^3.1.3",
"bintrees": "^1.0.2",
"ethereum-types": "^1.1.2",
"ethereumjs-blockstream": "6.0.0",
diff --git a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
index dbcc25186..1ec568a9b 100644
--- a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
+++ b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
@@ -50,7 +50,7 @@ export class DependentOrderHashesTracker {
return uniqueOrderHashList;
}
public getDependentOrderHashesByMaker(makerAddress: string): string[] {
- const dependentOrderHashes = Array.from(this._orderHashesByMakerAddress[makerAddress]);
+ const dependentOrderHashes = Array.from(this._orderHashesByMakerAddress[makerAddress] || {});
return dependentOrderHashes;
}
public getDependentOrderHashesByAssetDataByMaker(makerAddress: string, assetData: string): string[] {