diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-08-14 09:49:35 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-08-14 09:49:35 +0800 |
| commit | 10dc3ea81c1780c0b694fdf5f0864e3b281da566 (patch) | |
| tree | da451f191268cee02114dd90bdcda721d37d0820 /packages/web3-wrapper | |
| parent | c320c8742e140f00d93a82ade91c01e6602b861d (diff) | |
| parent | fadd292ecf367e42154856509d0ea0c20b23f2f1 (diff) | |
| download | dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.gz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.bz2 dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.lz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.xz dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.tar.zst dexon-sol-tools-10dc3ea81c1780c0b694fdf5f0864e3b281da566.zip | |
Fix merge
Diffstat (limited to 'packages/web3-wrapper')
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 3 | ||||
| -rw-r--r-- | packages/web3-wrapper/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | packages/web3-wrapper/package.json | 16 |
3 files changed, 18 insertions, 12 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 9224d89b0..422059cc0 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -10,7 +10,8 @@ "note": "Export RPC types", "pr": 938 } - ] + ], + "timestamp": 1534210131 }, { "timestamp": 1532619515, diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 4ebd92a75..0955993f4 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.2.0 - _August 13, 2018_ + + * Export marshaller to convert between RPC and user-space data formats (#938) + * Export RPC types (#938) + ## v1.1.2 - _July 26, 2018_ * Dependencies updated @@ -21,7 +26,7 @@ CHANGELOG * Dependencies updated -## v1.0.0 - _July 20, 2018_ +## v1.0.0 - _July 19, 2018_ * Stop exporting `marshaller` utility file. (#902) * Export `marshaller` utility file. (#829) @@ -40,7 +45,7 @@ CHANGELOG * Dependencies updated -## v0.7.0 - _June 4, 2018_ +## v0.7.0 - _June 3, 2018_ * Add `web3Wrapper.getContractCodeAsync` (#675) * Add `web3Wrapper.getTransactionTraceAsync` (#675) @@ -55,7 +60,7 @@ CHANGELOG * Dependencies updated -## v0.6.3 - _May 5, 2018_ +## v0.6.3 - _May 4, 2018_ * Dependencies updated diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index d0dd394b1..3f9ee9019 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "1.1.2", + "version": "1.2.0", "engines": { "node": ">=6.12" }, @@ -45,8 +45,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^1.0.4", - "@0xproject/tslint-config": "^1.0.4", + "@0xproject/monorepo-scripts": "^1.0.5", + "@0xproject/tslint-config": "^1.0.5", "@types/lodash": "4.14.104", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", @@ -64,11 +64,11 @@ "typescript": "2.9.2" }, "dependencies": { - "@0xproject/assert": "^1.0.4", - "@0xproject/json-schemas": "^1.0.1-rc.3", - "@0xproject/typescript-typings": "^1.0.3", - "@0xproject/utils": "^1.0.4", - "ethereum-types": "^1.0.3", + "@0xproject/assert": "^1.0.5", + "@0xproject/json-schemas": "^1.0.1-rc.4", + "@0xproject/typescript-typings": "^1.0.4", + "@0xproject/utils": "^1.0.5", + "ethereum-types": "^1.0.4", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.5" |