From 09659cc3041e8662e64beab2728477f3437c1ced Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 1 Feb 2018 12:30:41 +0100 Subject: Add build:watch command to all TS packages --- packages/utils/package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/utils') diff --git a/packages/utils/package.json b/packages/utils/package.json index db82f8040..65ee69805 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -5,6 +5,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { + "build:watch": "tsc -w", "build": "tsc", "clean": "shx rm -rf lib", "lint": "tslint --project . 'src/**/*.ts'" -- cgit v1.2.3 From 39e3733be4b2a8bb6f163c0aa02fbe57db213e61 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 1 Feb 2018 12:50:55 +0100 Subject: Upgrade TS to the newest version --- packages/utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/utils') diff --git a/packages/utils/package.json b/packages/utils/package.json index 65ee69805..99d9fbd2b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -27,7 +27,7 @@ "shx": "^0.2.2", "tslint": "5.8.0", "web3-typescript-typings": "^0.9.5", - "typescript": "~2.6.1" + "typescript": "2.7.1" }, "dependencies": { "bignumber.js": "~4.1.0", -- cgit v1.2.3 From d4631e14b2203bfd95b995d25819d8d9cb834336 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 1 Feb 2018 16:39:06 +0100 Subject: Publish - 0x.js@0.31.1 - @0xproject/abi-gen@0.1.6 - @0xproject/assert@0.0.15 - chai-as-promised-typescript-typings@0.0.8 - @0xproject/connect@0.5.4 - contracts@2.1.8 - @0xproject/deployer@0.0.5 - @0xproject/dev-utils@0.0.9 - @0xproject/json-schemas@0.7.7 - @0xproject/monorepo-scripts@0.1.8 - @0xproject/subproviders@0.3.5 - @0xproject/testnet-faucets@1.0.9 - @0xproject/tslint-config@0.4.6 - @0xproject/types@0.1.8 - @0xproject/utils@0.2.4 - web3-typescript-typings@0.9.8 - @0xproject/web3-wrapper@0.1.9 - @0xproject/website@0.0.11 --- packages/utils/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/utils') diff --git a/packages/utils/package.json b/packages/utils/package.json index db82f8040..5c03826ba 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.2.3", + "version": "0.2.4", "description": "0x TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,14 +19,14 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.5", - "@0xproject/types": "^0.1.5", + "@0xproject/tslint-config": "^0.4.6", + "@0xproject/types": "^0.1.8", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "web3-typescript-typings": "^0.9.5", - "typescript": "~2.6.1" + "typescript": "~2.6.1", + "web3-typescript-typings": "^0.9.8" }, "dependencies": { "bignumber.js": "~4.1.0", -- cgit v1.2.3 From 45ac9603083c38dbab6fb6eff26c744eea2b4429 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 2 Feb 2018 12:42:19 +0100 Subject: Add build:watch to README's --- packages/utils/README.md | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'packages/utils') diff --git a/packages/utils/README.md b/packages/utils/README.md index d6cacfa11..ffb0d0190 100644 --- a/packages/utils/README.md +++ b/packages/utils/README.md @@ -40,6 +40,12 @@ yarn install yarn build ``` +or + +```bash +yarn build:watch +``` + ### Lint ```bash -- cgit v1.2.3 From 85b4a82a4bc1059b3321763e20b8e2c4d8ff0e73 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 12:03:13 +0100 Subject: Add missing comas --- packages/utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/utils') diff --git a/packages/utils/package.json b/packages/utils/package.json index dc0a79f0a..e276d5e5a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -26,7 +26,7 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1" + "typescript": "2.7.1", "web3-typescript-typings": "^0.9.8" }, "dependencies": { -- cgit v1.2.3 From 5458a1c1b741fb2ccb477cf2ac0ba81d4e351402 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 12:59:10 +0100 Subject: Fix an exception when a signature collision happens --- packages/utils/src/abi_decoder.ts | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'packages/utils') diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts index f96ee2edb..2dd7134a7 100644 --- a/packages/utils/src/abi_decoder.ts +++ b/packages/utils/src/abi_decoder.ts @@ -36,9 +36,14 @@ export class AbiDecoder { const dataTypes = _.map(nonIndexedInputs, input => input.type); const decodedData = SolidityCoder.decodeParams(dataTypes, logData.slice('0x'.length)); + let failedToDecode = false; _.map(event.inputs, (param: Web3.EventParameter) => { // Indexed parameters are stored in topics. Non-indexed ones in decodedData let value: BigNumber | string = param.indexed ? log.topics[topicsIndex++] : decodedData[dataIndex++]; + if (_.isUndefined(value)) { + failedToDecode = true; + return; + } if (param.type === SolidityTypes.Address) { value = AbiDecoder._padZeros(new BigNumber(value).toString(16)); } else if ( @@ -51,11 +56,15 @@ export class AbiDecoder { decodedParams[param.name] = value; }); - return { - ...log, - event: event.name, - args: decodedParams, - }; + if (failedToDecode) { + return log; + } else { + return { + ...log, + event: event.name, + args: decodedParams, + }; + } } private _addABI(abiArray: Web3.AbiDefinition[]): void { _.map(abiArray, (abi: Web3.AbiDefinition) => { -- cgit v1.2.3 From 1f4cbb747976560df0e67e703311db8f21f75604 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 13:04:49 +0100 Subject: Use forEach instead of map --- packages/utils/CHANGELOG.md | 8 ++++++-- packages/utils/src/abi_decoder.ts | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'packages/utils') diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index efee30dd1..0abe835b8 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG +## v0.x.x - _TBD, 2018_ + + * Fix a bug causing abi_decoder to throw on unknown events with the same signature (#366) + ## v0.2.0 - _January 17, 2018_ -* Add `onError` parameter to `intervalUtils.setAsyncExcludingInterval` (#312) -* Add `intervalUtils.setInterval` (#312) + * Add `onError` parameter to `intervalUtils.setAsyncExcludingInterval` (#312) + * Add `intervalUtils.setInterval` (#312) diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts index 2dd7134a7..368973b1b 100644 --- a/packages/utils/src/abi_decoder.ts +++ b/packages/utils/src/abi_decoder.ts @@ -18,7 +18,7 @@ export class AbiDecoder { return `0x${formatted}`; } constructor(abiArrays: Web3.AbiDefinition[][]) { - _.map(abiArrays, this._addABI.bind(this)); + _.forEach(abiArrays, this._addABI.bind(this)); } // This method can only decode logs from the 0x & ERC20 smart contracts public tryToDecodeLogOrNoop(log: Web3.LogEntry): LogWithDecodedArgs | RawLog { @@ -37,7 +37,7 @@ export class AbiDecoder { const decodedData = SolidityCoder.decodeParams(dataTypes, logData.slice('0x'.length)); let failedToDecode = false; - _.map(event.inputs, (param: Web3.EventParameter) => { + _.forEach(event.inputs, (param: Web3.EventParameter) => { // Indexed parameters are stored in topics. Non-indexed ones in decodedData let value: BigNumber | string = param.indexed ? log.topics[topicsIndex++] : decodedData[dataIndex++]; if (_.isUndefined(value)) { -- cgit v1.2.3 From 6fce02d25e8133da16b1965cbd51b1edb74fcf7a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 21:50:57 +0100 Subject: Change CHANGELOGs --- packages/utils/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/utils') diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 0abe835b8..d1c3264fa 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -2,7 +2,7 @@ ## v0.x.x - _TBD, 2018_ - * Fix a bug causing abi_decoder to throw on unknown events with the same signature (#366) + * Fix a bug related to event signature collisions (argument indexes aren't included in event signatures) in the abi_decoder. The decoder used to throw on unknown events with identical signatures as a known event (except indexes). (#366) ## v0.2.0 - _January 17, 2018_ -- cgit v1.2.3 From 46ad7b1b38df0f302821258629ffa749e7dd00b9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 5 Feb 2018 22:04:03 +0100 Subject: Add dates to CHANGELOGs --- packages/utils/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/utils') diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index d1c3264fa..b94e2ccee 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,6 +1,6 @@ # CHANGELOG -## v0.x.x - _TBD, 2018_ +## v0.3.0 - _February 5, 2018_ * Fix a bug related to event signature collisions (argument indexes aren't included in event signatures) in the abi_decoder. The decoder used to throw on unknown events with identical signatures as a known event (except indexes). (#366) -- cgit v1.2.3