diff options
| author | Jacob Evans <dekz@dekz.net> | 2018-04-20 06:49:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 06:49:23 +0800 |
| commit | 62a55c013516c82eb4aa26c90db7533cd72f8d1b (patch) | |
| tree | a96728392d7f9890e8a8f5a8c18627acc2ea8f28 /packages/utils | |
| parent | f6fd4281a4772c28521fa606bd37f16a21dbe23c (diff) | |
| parent | 72336eb393d775817619a354d784b7dea4e243bf (diff) | |
| download | dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar.gz dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar.bz2 dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar.lz dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar.xz dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.tar.zst dexon-sol-tools-62a55c013516c82eb4aa26c90db7533cd72f8d1b.zip | |
Merge pull request #540 from 0xProject/feature/abi-gen/tuple-return-types
Support Tuples returned from functions
Diffstat (limited to 'packages/utils')
| -rw-r--r-- | packages/utils/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/utils/package.json | 2 | ||||
| -rw-r--r-- | packages/utils/src/abi_decoder.ts | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 1aeb3b457..e7f3c052c 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "version": "0.6.0", + "changes": [ + { + "note": "Update ethers-contracts to ethers.js", + "pr": 540 + } + ] + }, + { "version": "0.5.2", "changes": [ { diff --git a/packages/utils/package.json b/packages/utils/package.json index bbc87c53f..f309c2126 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -35,7 +35,7 @@ "@0xproject/typescript-typings": "^0.2.0", "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", - "ethers-contracts": "^2.2.1", + "ethers": "^3.0.15", "js-sha3": "^0.7.0", "lodash": "^4.17.4", "web3": "^0.20.0" diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts index 36c7839cf..150f74a15 100644 --- a/packages/utils/src/abi_decoder.ts +++ b/packages/utils/src/abi_decoder.ts @@ -9,7 +9,7 @@ import { RawLog, SolidityTypes, } from '@0xproject/types'; -import * as ethersContracts from 'ethers-contracts'; +import * as ethers from 'ethers'; import * as _ from 'lodash'; import { BigNumber } from './configured_bignumber'; @@ -36,7 +36,7 @@ export class AbiDecoder { if (_.isUndefined(event)) { return log; } - const ethersInterface = new ethersContracts.Interface([event]); + const ethersInterface = new ethers.Interface([event]); const logData = log.data; const decodedParams: DecodedLogArgs = {}; let topicsIndex = 1; @@ -77,10 +77,10 @@ export class AbiDecoder { if (_.isUndefined(abiArray)) { return; } - const ethersInterface = new ethersContracts.Interface(abiArray); + const ethersInterface = new ethers.Interface(abiArray); _.map(abiArray, (abi: AbiDefinition) => { if (abi.type === AbiType.Event) { - const topic = ethersInterface.events[abi.name].topic; + const topic = ethersInterface.events[abi.name].topics[0]; this._methodIds[topic] = abi; } }); |