diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index ed3c86465d..c5d467b7f8 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.3.0", + "changes": [ + { + "note": "Update ethers-contracts to ethers.js", + "pr": 540 + } + ] + }, { "timestamp": 1524044013, "version": "0.2.1", diff --git a/packages/contract_templates/partials/callAsync.handlebars b/packages/contract_templates/partials/callAsync.handlebars index 3cc16ccc67..58fb2f09c7 100644 --- a/packages/contract_templates/partials/callAsync.handlebars +++ b/packages/contract_templates/partials/callAsync.handlebars @@ -18,12 +18,10 @@ async callAsync( } ) const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock); - let result = ethersFunction.parse(rawCallResult); - + let resultArray = ethersFunction.parse(rawCallResult); const outputAbi = (_.find(self.abi, {name: '{{this.name}}'}) as MethodAbi).outputs; - result = BaseContract._formatABIDataItemList(outputAbi, result, BaseContract._lowercaseAddress.bind(this)); - result = BaseContract._formatABIDataItemList(outputAbi, result, BaseContract._bnToBigNumber.bind(this)); - - return result{{#singleReturnValue}}[0]{{/singleReturnValue}}; + resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this)); + resultArray = BaseContract._formatABIDataItemList(outputAbi, resultArray, BaseContract._bnToBigNumber.bind(this)); + return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}}; }, {{/hasReturnValue}} diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index a2f1e76151..3ef30ad8ef 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.3.0", + "changes": [ + { + "note": "Add types for `ethers.js`", + "pr": 540 + } + ] + }, { "version": "0.2.0", "changes": [ diff --git a/packages/typescript-typings/types/ethers/index.d.ts b/packages/typescript-typings/types/ethers/index.d.ts index a3d27a98c6..7e04c7dd13 100644 --- a/packages/typescript-typings/types/ethers/index.d.ts +++ b/packages/typescript-typings/types/ethers/index.d.ts @@ -23,17 +23,9 @@ declare module 'ethers' { export class Interface { public functions: { [functionName: string]: FunctionDescription }; public events: { [eventName: string]: EventDescription }; - // public static decodeParams(types: string[], data: string): any[]; constructor(abi: any); } export class Contract { constructor(address: string, abi: any, provider: any); } } - -declare module 'ethers/utils/abi-coder' { - export class Coder { - public decode(names: any[], types: any[], data?: any[]): any[]; - defaultCoder: Coder; - } -} diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 1aeb3b4572..e7f3c052c6 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.6.0", + "changes": [ + { + "note": "Update ethers-contracts to ethers.js", + "pr": 540 + } + ] + }, { "version": "0.5.2", "changes": [ diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index f11efb1a5d..1183307074 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -61,7 +61,6 @@ "@0xproject/types": "^0.6.1", "@0xproject/typescript-typings": "^0.2.0", "@0xproject/utils": "^0.5.2", - "ethers-contracts": "^2.2.1", "ethers": "^3.0.15", "lodash": "^4.17.4", "web3": "^0.20.0"