aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Evans <jacob@dekz.net>2018-04-19 14:54:42 +0800
committerJacob Evans <jacob@dekz.net>2018-04-19 15:16:05 +0800
commit5c232b6a8d3920ed987fcc9b158a17a62a953172 (patch)
tree5b2233a989d8afb9606b09eed81026c253088c5e
parent4bee63afc69b10ee5a9a4aa9279a926068a37242 (diff)
downloaddexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar.gz
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar.bz2
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar.lz
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar.xz
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.tar.zst
dexon-sol-tools-5c232b6a8d3920ed987fcc9b158a17a62a953172.zip
Update CHANGELOGs
-rw-r--r--packages/base-contract/CHANGELOG.json9
-rw-r--r--packages/contract_templates/partials/callAsync.handlebars10
-rw-r--r--packages/typescript-typings/CHANGELOG.json9
-rw-r--r--packages/typescript-typings/types/ethers/index.d.ts8
-rw-r--r--packages/utils/CHANGELOG.json9
-rw-r--r--packages/web3-wrapper/package.json1
6 files changed, 31 insertions, 15 deletions
diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json
index ed3c86465..c5d467b7f 100644
--- a/packages/base-contract/CHANGELOG.json
+++ b/packages/base-contract/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "0.3.0",
+ "changes": [
+ {
+ "note": "Update ethers-contracts to ethers.js",
+ "pr": 540
+ }
+ ]
+ },
+ {
"timestamp": 1524044013,
"version": "0.2.1",
"changes": [
diff --git a/packages/contract_templates/partials/callAsync.handlebars b/packages/contract_templates/partials/callAsync.handlebars
index 3cc16ccc6..58fb2f09c 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 a2f1e7615..3ef30ad8e 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "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 a3d27a98c..7e04c7dd1 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 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/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index f11efb1a5..118330707 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"