Merge pull request #2901 from MetaMask/DefaultToOneGwei

Default gas estimate to 1 gwei for networks with no block activity

2 files changed, 25 insertions, 0 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index aa2dddf3d..6ed0fd467 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -490,6 +490,12 @@ module.exports = class MetamaskController extends EventEmitter {
   getGasPrice () {
     const { recentBlocksController } = this
     const { recentBlocks } = recentBlocksController.store.getState()
+
+    // Return 1 gwei if no blocks have been observed:
+    if (recentBlocks.length === 0) {
+      return '0x' + GWEI_BN.toString(16)
+    }
+
     const lowestPrices = recentBlocks.map((block) => {
       if (!block.gasPrices) {
         return GWEI_BN
diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js
index 9ec7cd0af..3fc7f9a98 100644
--- a/test/unit/metamask-controller-test.js
+++ b/test/unit/metamask-controller-test.js
@@ -72,6 +72,25 @@ describe('MetaMaskController', function () {
 
         metamaskController.recentBlocksController = realRecentBlocksController
       })
+
+      it('gives the 1 gwei price if no blocks have been seen.', async function () {
+        const realRecentBlocksController = metamaskController.recentBlocksController
+        metamaskController.recentBlocksController = {
+          store: {
+            getState: () => {
+              return {
+                recentBlocks: []
+              }
+            }
+          }
+        }
+
+        const gasPrice = metamaskController.getGasPrice()
+        assert.equal(gasPrice, '0x' + GWEI_BN.toString(16), 'defaults to 1 gwei')
+
+        metamaskController.recentBlocksController = realRecentBlocksController
+      })
+
     })
 
     describe('#createNewVaultAndKeychain', function () {