Merge branch '1.x' into dependabot/npm_and_yarn/packages/web3-bzz/ell…

…iptic-6.5.3
web3 · Oct 22, 2020 · f628bf6 · f628bf6
2 parents 2c2a1c1 + 3308491
commit f628bf6
Show file tree

Hide file tree

Showing 5 changed files with 476 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -291,6 +291,7 @@ Released with 1.0.0-beta.37 code base.
 ## [1.3.1]
 
 ### Changed
+
 - bump utils 0.10.0^ -> 0.12.0 (#3733)
 
 ### Removed
@@ -299,4 +300,6 @@ Released with 1.0.0-beta.37 code base.
 
 ### Fixed
 
-- Fixed decoding bytes and string parameters for logs emitted with solc 0.4.x (#3724, #3738)
+- Fix possible unhandled promise rejection when sending a transaction (#3708)
+- Fixed decoding bytes and string parameters for logs emitted with solc 0.4.x (#3724, #3738)
+- Grammar changes to inputAddressFormatter error message
diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst
@@ -1466,7 +1466,7 @@ Example
     // using the callback
     web3.eth.sendTransaction({
         from: '0xde0B295669a9FD93d5F28D9Ec85E40f4cb697BAe',
-        data: code // deploying a contracrt
+        data: code // deploying a contract
     }, function(error, hash){
         ...
     });

diff --git a/packages/web3-core-helpers/src/formatters.js b/packages/web3-core-helpers/src/formatters.js
@@ -472,7 +472,7 @@ var inputAddressFormatter = function (address) {
     } else if (utils.isAddress(address)) {
         return '0x' + address.toLowerCase().replace('0x', '');
     }
-    throw new Error('Provided address "' + address + '" is invalid, the capitalization checksum test failed, or its an indrect IBAN address which can\'t be converted.');
+    throw new Error(`Provided address ${address} is invalid, the capitalization checksum test failed, or it's an indirect IBAN address which can't be converted.`);
 };
 
 
@@ -508,4 +508,3 @@ module.exports = {
     outputPostFormatter: outputPostFormatter,
     outputSyncingFormatter: outputSyncingFormatter
 };
-
diff --git a/packages/web3-core-method/src/index.js b/packages/web3-core-method/src/index.js
@@ -725,17 +725,22 @@ Method.prototype.buildCall = function () {
                             txOptions.common = method.defaultCommon;
                         }
 
-                        return method.accounts.signTransaction(txOptions, wallet.privateKey)
+                        method.accounts.signTransaction(txOptions, wallet.privateKey)
                             .then(sendSignedTx)
                             .catch(function (err) {
                                 if (_.isFunction(defer.eventEmitter.listeners) && defer.eventEmitter.listeners('error').length) {
-                                    defer.eventEmitter.emit('error', err);
+                                    try {
+                                        defer.eventEmitter.emit('error', err);
+                                    } catch (err) {
+                                        // Ignore userland error prevent it to bubble up within web3.
+                                    }
                                     defer.eventEmitter.removeAllListeners();
                                     defer.eventEmitter.catch(function () {
                                     });
                                 }
                                 defer.reject(err);
                             });
+                        return;
                     }
 
                     // ETH_SIGN