From 2a4456b9cae6515d0210e3a2aa4b511c0262849c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 10:48:00 +0200 Subject: Update CHANGELOG's with publishes performed on development branch --- packages/web3-wrapper/CHANGELOG.json | 13 +++++++++++++ packages/web3-wrapper/CHANGELOG.md | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index bd4bf06dd..1f1c8e2c0 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,5 +1,18 @@ [ { +<<<<<<< HEAD +======= + "timestamp": 1529397769, + "version": "0.7.1", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, + { + "timestamp": 1528070400, +>>>>>>> 40a061a5... Updated CHANGELOGS "version": "0.7.0", "changes": [ { diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 4b8fb7bac..1ac36a316 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -5,11 +5,19 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v0.7.1 - _June 19, 2018_ + + * Dependencies updated + +## v0.7.0 - _June 4, 2018_ + + * Add default parameters when sending a raw payload + ## v0.6.4 - _May 22, 2018_ * Dependencies updated -## v0.6.3 - _May 4, 2018_ +## v0.6.3 - _May 5, 2018_ * Dependencies updated -- cgit v1.2.3 From f2e0f1b2f180a783c1676120218712f50f4f93d7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 11:32:55 +0200 Subject: Update all package versions to match latest published to NPM --- packages/web3-wrapper/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index de2b72ac6..3c5b2c616 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.6.4", + "version": "0.7.1", "engines": { "node": ">=6.12" }, @@ -45,8 +45,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.1.20", - "@0xproject/tslint-config": "^0.4.18", + "@0xproject/monorepo-scripts": "^0.2.1", + "@0xproject/tslint-config": "^0.4.20", "@types/lodash": "4.14.104", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", @@ -64,10 +64,10 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/typescript-typings": "^0.3.2", - "@0xproject/utils": "^0.6.2", + "@0xproject/typescript-typings": "^0.4.1", + "@0xproject/utils": "^0.7.1", "ethereum-types": "^0.0.1", - "ethers": "^3.0.15", + "ethers": "3.0.22", "lodash": "^4.17.4", "web3": "^0.20.0" }, -- cgit v1.2.3 From 17d49067e9cefc61fb906e1118dac1d85f6ee69b Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 19 Jun 2018 12:56:22 +0200 Subject: Fix missed merge conflicts --- packages/web3-wrapper/CHANGELOG.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 1f1c8e2c0..624ad7151 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,7 +1,5 @@ [ { -<<<<<<< HEAD -======= "timestamp": 1529397769, "version": "0.7.1", "changes": [ @@ -12,7 +10,6 @@ }, { "timestamp": 1528070400, ->>>>>>> 40a061a5... Updated CHANGELOGS "version": "0.7.0", "changes": [ { -- cgit v1.2.3 From df50232ed90fd880019eff9c9fe66fb2a4cff4bb Mon Sep 17 00:00:00 2001 From: Ara Kevonian <=> Date: Tue, 19 Jun 2018 04:13:32 -0700 Subject: Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility --- packages/web3-wrapper/src/web3_wrapper.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index 5d2eedcb3..6ea69883c 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -491,8 +491,13 @@ export class Web3Wrapper { } private async _sendRawPayloadAsync(payload: Partial): Promise { const sendAsync = this._web3.currentProvider.sendAsync.bind(this._web3.currentProvider); - payload.id = this._jsonRpcRequestId++; - const response = await promisify(sendAsync)(payload); + const payloadWithDefaults = { + id: this._jsonRpcRequestId++, + params: [], + jsonrpc: '2.0', + ...payload, + }; + const response = await promisify(sendAsync)(payloadWithDefaults); const result = response.result; return result; } -- cgit v1.2.3