Merge pull request #2510 from ethereum/issue/2500

Unhandled promise rejection of EthSendTransactionMethod fixed.
web3 · Mar 18, 2019 · 99732d8 · 99732d8
2 parents 4bd1410 + f0eb85e
commit 99732d8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ addons:
     packages:
     - g++-4.8
 before_script:
+    - npm i -g typescript@next
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
 install:

diff --git a/packages/web3-core-method/src/methods/transaction/EthSendTransactionMethod.js b/packages/web3-core-method/src/methods/transaction/EthSendTransactionMethod.js
@@ -65,11 +65,16 @@ export default class EthSendTransactionMethod extends SendTransactionMethod {
 
         if (!this.parameters[0].gasPrice) {
             if (!this.moduleInstance.defaultGasPrice) {
-                this.moduleInstance.currentProvider.send('eth_gasPrice', []).then((gasPrice) => {
-                    this.parameters[0].gasPrice = gasPrice;
+                this.moduleInstance.currentProvider
+                    .send('eth_gasPrice', [])
+                    .then((gasPrice) => {
+                        this.parameters[0].gasPrice = gasPrice;
 
-                    this.execute();
-                });
+                        this.execute();
+                    })
+                    .catch((error) => {
+                        this.handleError(error, false, 0);
+                    });
 
                 return this.promiEvent;
             }
@@ -81,13 +86,7 @@ export default class EthSendTransactionMethod extends SendTransactionMethod {
             if (this.moduleInstance.accounts.wallet[this.parameters[0].from]) {
                 this.sendRawTransaction(this.moduleInstance.accounts.wallet[this.parameters[0].from].privateKey).catch(
                     (error) => {
-                        if (this.callback) {
-                            this.callback(error, null);
-                        }
-
-                        this.promiEvent.reject(error);
-                        this.promiEvent.emit('error', error);
-                        this.promiEvent.removeAllListeners();
+                        this.handleError(error, false, 0);
                     }
                 );
 
@@ -97,13 +96,7 @@ export default class EthSendTransactionMethod extends SendTransactionMethod {
 
         if (this.hasCustomSigner()) {
             this.sendRawTransaction().catch((error) => {
-                if (this.callback) {
-                    this.callback(error, null);
-                }
-
-                this.promiEvent.reject(error);
-                this.promiEvent.emit('error', error);
-                this.promiEvent.removeAllListeners();
+                this.handleError(error, false, 0);
             });
 
             return this.promiEvent;

diff --git a/packages/web3-core-method/tests/src/methods/transaction/EthSendTransactionMethodTest.js b/packages/web3-core-method/tests/src/methods/transaction/EthSendTransactionMethodTest.js
@@ -505,6 +505,25 @@ describe('EthSendTransactionMethodTest', () => {
         expect(providerMock.send).toHaveBeenNthCalledWith(1, 'eth_gasPrice', []);
     });
 
+    it('calls execute and the gasPrice will be defined with "eth_gasPrice" and returns with a reject promise', async () => {
+        providerMock.send = jest.fn(() => {
+            return Promise.reject(new Error('Nope'));
+        });
+
+        const transaction = {
+            from: 0,
+            gas: 1,
+            nonce: 1,
+            chainId: 1
+        };
+
+        method.parameters = [transaction];
+
+        await expect(method.execute()).rejects.toThrow('Nope');
+
+        expect(providerMock.send).toHaveBeenNthCalledWith(1, 'eth_gasPrice', []);
+    });
+
     it('calls execute and signs on the node', () => {
         moduleInstanceMock.transactionSigner = transactionSignerMock;