From aefafed1a9886f6961f4b9db05e1302e7ef8f411 Mon Sep 17 00:00:00 2001 From: Erik Iglikov Date: Wed, 7 Nov 2018 14:40:47 -0800 Subject: [PATCH 1/4] fixed cached-path-relative security issue --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2517523d..fc369473 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,8 @@ "nodemon": "^1.18.4", "nyc": "^13.0.1", "sandboxed-module": "^2.0.2", - "vinyl-source-stream": "^2.0.0" + "vinyl-source-stream": "^2.0.0", + "cached-path-relative": ">=1.0.2" }, "dependencies": { "async": "^2.6.1", From 35eee8272ad332abcf8b06b954e35d1cb972185a Mon Sep 17 00:00:00 2001 From: Erik Iglikov Date: Tue, 4 Dec 2018 19:05:19 -0500 Subject: [PATCH 2/4] fix for getTransactionReceipt issue --- packages/web3-core-method/src/index.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/web3-core-method/src/index.js b/packages/web3-core-method/src/index.js index 10bd55c7..016b52ba 100644 --- a/packages/web3-core-method/src/index.js +++ b/packages/web3-core-method/src/index.js @@ -255,16 +255,11 @@ Method.prototype._confirmTransaction = function (defer, result, payload) { } // if we have a valid receipt we don't need to send a request return (existingReceipt ? promiEvent.resolve(existingReceipt) : _ethereumCall.getTransactionReceipt(result)) - // catch error from requesting receipt - .catch(function (err) { - sub.unsubscribe(); - promiseResolved = true; - utils._fireError({message: 'Failed to check for transaction receipt:', data: err}, defer.eventEmitter, defer.reject); - }) + // if CONFIRMATION listener exists check for confirmations, by setting canUnsubscribe = false .then(function(receipt) { - if (!receipt || !receipt.blockHash) { - throw new Error('Receipt missing or blockHash null'); + if (!receipt.blockHash) { + throw new Error('Receipt missing or blockHash null'); throw new Error('blockHash null'); } // apply extra formatters From 78f682115d35bd975aa9c7b8a7dcf2c51804edd1 Mon Sep 17 00:00:00 2001 From: Erik Iglikov Date: Tue, 4 Dec 2018 19:07:32 -0500 Subject: [PATCH 3/4] removed library fix --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index e0abe9ad..0131b8eb 100644 --- a/package.json +++ b/package.json @@ -94,8 +94,7 @@ "nodemon": "^1.18.4", "nyc": "^13.0.1", "sandboxed-module": "^2.0.2", - "vinyl-source-stream": "^2.0.0", - "cached-path-relative": ">=1.0.2" + "vinyl-source-stream": "^2.0.0" }, "dependencies": { "async": "^2.6.1", From 9aaa586e7c5d22f161c903baaebe30046dd9b3aa Mon Sep 17 00:00:00 2001 From: Erik Iglikov <31218827+erik-iglikov@users.noreply.github.com> Date: Thu, 6 Dec 2018 14:53:44 -0500 Subject: [PATCH 4/4] Update index.js remove unnecessary second throw --- packages/web3-core-method/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-core-method/src/index.js b/packages/web3-core-method/src/index.js index 016b52ba..e93a01b6 100644 --- a/packages/web3-core-method/src/index.js +++ b/packages/web3-core-method/src/index.js @@ -259,7 +259,7 @@ Method.prototype._confirmTransaction = function (defer, result, payload) { // if CONFIRMATION listener exists check for confirmations, by setting canUnsubscribe = false .then(function(receipt) { if (!receipt.blockHash) { - throw new Error('Receipt missing or blockHash null'); throw new Error('blockHash null'); + throw new Error('Receipt missing or blockHash null'); } // apply extra formatters