diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-11-13 07:10:46 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-11-13 07:10:46 +0800 |
| commit | 7068f7b4d125e06049c263f0a726d562a6f6e99e (patch) | |
| tree | f52d91cca3acd15aebad58880e72416aebf48d19 /packages/web3-wrapper | |
| parent | 79f0324abc6e59d5595770e44d620e6d0cccd6bc (diff) | |
| parent | add1cfd26132465ad51a3f9cf2ae8362fc301fcf (diff) | |
| download | dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar.gz dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar.bz2 dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar.lz dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar.xz dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.tar.zst dexon-sol-tools-7068f7b4d125e06049c263f0a726d562a6f6e99e.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/metamask-connect-flow
Diffstat (limited to 'packages/web3-wrapper')
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | packages/web3-wrapper/package.json | 6 | ||||
| -rw-r--r-- | packages/web3-wrapper/src/web3_wrapper.ts | 5 |
4 files changed, 17 insertions, 7 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 7b21da73a..89d153eef 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "timestamp": 1542028948, + "version": "3.1.2", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { "version": "3.1.1", "changes": [ { diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index ebbef2c48..80ac76b9a 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v3.1.2 - _November 12, 2018_ + + * Dependencies updated + ## v3.1.1 - _November 9, 2018_ * Fix bug in `getTransactionByHashAsync` which was causing the return value to have the wrong type (raw fields instead of unmarshalled fields). (#1177) diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 2b87cc92a..9f3bfe3c3 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0x/web3-wrapper", - "version": "3.1.1", + "version": "3.1.2", "engines": { "node": ">=6.12" }, @@ -53,8 +53,8 @@ "typescript": "3.0.1" }, "dependencies": { - "@0x/assert": "^1.0.15", - "@0x/json-schemas": "^2.0.1", + "@0x/assert": "^1.0.16", + "@0x/json-schemas": "^2.1.0", "@0x/typescript-typings": "^3.0.4", "@0x/utils": "^2.0.4", "ethereum-types": "^1.1.2", diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index 56877fef3..be1713f20 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -157,7 +157,7 @@ export class Web3Wrapper { this.abiDecoder = new AbiDecoder([]); this._provider = provider; this._txDefaults = txDefaults || {}; - this._jsonRpcRequestId = 0; + this._jsonRpcRequestId = 1; } /** * Get the contract defaults set to the Web3Wrapper instance @@ -533,9 +533,6 @@ export class Web3Wrapper { method: 'eth_call', params: [callDataHex, marshalledDefaultBlock], }); - if (rawCallResult === '0x') { - throw new Error('Contract call failed (returned null)'); - } return rawCallResult; } /** |