From ca72c9def514101418778dbafc7a584a5e53e0eb Mon Sep 17 00:00:00 2001 From: Seth Date: Fri, 1 May 2020 14:05:36 -0400 Subject: [PATCH 1/2] Makes nonce errors conclusive --- lib/eth/EthRpc.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/eth/EthRpc.js b/lib/eth/EthRpc.js index 90215aff..10378431 100644 --- a/lib/eth/EthRpc.js +++ b/lib/eth/EthRpc.js @@ -250,7 +250,12 @@ class EthRPC { .sendSignedTransaction(rawTx) .once('transactionHash', resolve) .once('error', reject) - .catch(err => reject(err)); + .catch((err) => { + if (err.message.includes('nonce')) { + err.conclusive = true; + } + reject(err); + }); }); } From 82ce2a204ca6d9bebdbf1344a16baea96b940e9a Mon Sep 17 00:00:00 2001 From: Seth Date: Fri, 1 May 2020 15:38:55 -0400 Subject: [PATCH 2/2] Check if err.message exists before includes --- lib/eth/EthRpc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eth/EthRpc.js b/lib/eth/EthRpc.js index 10378431..72fdef33 100644 --- a/lib/eth/EthRpc.js +++ b/lib/eth/EthRpc.js @@ -251,7 +251,7 @@ class EthRPC { .once('transactionHash', resolve) .once('error', reject) .catch((err) => { - if (err.message.includes('nonce')) { + if (err && err.message && err.message.includes('nonce')) { err.conclusive = true; } reject(err);