Merge pull request #7059 from MetaMask/Gas-Estimation-Api

Remove blockscale, replace with ethgasstation
MetaMask · Aug 22, 2019 · fe2d053 · fe2d053
2 parents ecbde20 + f9bdc80
commit fe2d053
Show file tree

Hide file tree

Showing 4 changed files with 130 additions and 101 deletions.
diff --git a/ui/app/ducks/gas/gas-duck.test.js b/ui/app/ducks/gas/gas-duck.test.js
@@ -321,10 +321,10 @@ describe('Gas Duck', () => {
       assert.deepEqual(
         global.fetch.getCall(0).args,
         [
-          'https://dev.blockscale.net/api/gasexpress.json',
+          'https://ethgasstation.info/json/ethgasAPI.json',
           {
             'headers': {},
-            'referrer': 'https://dev.blockscale.net/api/',
+            'referrer': 'http://ethgasstation.info/json/',
             'referrerPolicy': 'no-referrer-when-downgrade',
             'body': null,
             'method': 'GET',
@@ -341,12 +341,12 @@ describe('Gas Duck', () => {
         [{
           type: SET_BASIC_GAS_ESTIMATE_DATA,
           value: {
-            average: 20,
+            average: 2,
             blockTime: 'mockBlock_time',
             blockNum: 'mockBlockNum',
-            fast: 30,
-            fastest: 40,
-            safeLow: 10,
+            fast: 3,
+            fastest: 4,
+            safeLow: 1,
           },
         }]
       )
@@ -420,10 +420,10 @@ describe('Gas Duck', () => {
       assert.deepEqual(
         global.fetch.getCall(0).args,
         [
-          'https://dev.blockscale.net/api/gasexpress.json',
+          'https://ethgasstation.info/json/ethgasAPI.json',
           {
             'headers': {},
-            'referrer': 'https://dev.blockscale.net/api/',
+            'referrer': 'http://ethgasstation.info/json/',
             'referrerPolicy': 'no-referrer-when-downgrade',
             'body': null,
             'method': 'GET',
@@ -440,12 +440,12 @@ describe('Gas Duck', () => {
         [{
           type: SET_BASIC_GAS_ESTIMATE_DATA,
           value: {
-            average: 20,
+            average: 2,
             blockTime: 'mockBlock_time',
             blockNum: 'mockBlockNum',
-            fast: 30,
-            fastest: 40,
-            safeLow: 10,
+            fast: 3,
+            fastest: 4,
+            safeLow: 1,
           },
         }]
       )

diff --git a/ui/app/ducks/gas/gas.duck.js b/ui/app/ducks/gas/gas.duck.js
@@ -198,23 +198,31 @@ export function fetchBasicGasEstimates () {
 }
 
 async function fetchExternalBasicGasEstimates (dispatch) {
-  const response = await fetch('https://dev.blockscale.net/api/gasexpress.json', {
+  const response = await fetch('https://ethgasstation.info/json/ethgasAPI.json', {
     'headers': {},
-    'referrer': 'https://dev.blockscale.net/api/',
+    'referrer': 'http://ethgasstation.info/json/',
     'referrerPolicy': 'no-referrer-when-downgrade',
     'body': null,
     'method': 'GET',
-    'mode': 'cors'}
-  )
+    'mode': 'cors',
+  })
+
   const {
-    safeLow,
-    standard: average,
-    fast,
-    fastest,
+    safeLow: safeLowTimes10,
+    average: averageTimes10,
+    fast: fastTimes10,
+    fastest: fastestTimes10,
     block_time: blockTime,
     blockNum,
   } = await response.json()
 
+  const [average, fast, fastest, safeLow] = [
+    averageTimes10,
+    fastTimes10,
+    fastestTimes10,
+    safeLowTimes10,
+  ].map(price => (new BigNumber(price)).div(10).toNumber())
+
   const basicEstimates = {
     safeLow,
     average,
@@ -260,8 +268,9 @@ async function fetchExternalBasicGasAndTimeEstimates (dispatch) {
     'referrerPolicy': 'no-referrer-when-downgrade',
     'body': null,
     'method': 'GET',
-    'mode': 'cors'}
-  )
+    'mode': 'cors',
+  })
+
   const {
     average: averageTimes10,
     avgWait,

diff --git a/ui/app/selectors/custom-gas.js b/ui/app/selectors/custom-gas.js
@@ -239,10 +239,10 @@ function getRenderableBasicEstimateData (state, gasLimit) {
     gas: {
       basicEstimates: {
         safeLow,
+        average,
         fast,
-        fastest,
         safeLowWait,
-        fastestWait,
+        avgWait,
         fastWait,
       },
     },
@@ -260,21 +260,21 @@ function getRenderableBasicEstimateData (state, gasLimit) {
     },
     {
       labelKey: 'average',
-      feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit),
+      feeInPrimaryCurrency: getRenderableEthFee(average, gasLimit),
       feeInSecondaryCurrency: showFiat
-        ? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
+        ? getRenderableConvertedCurrencyFee(average, gasLimit, currentCurrency, conversionRate)
         : '',
-      timeEstimate: fastWait && getRenderableTimeEstimate(fastWait),
-      priceInHexWei: getGasPriceInHexWei(fast),
+      timeEstimate: avgWait && getRenderableTimeEstimate(avgWait),
+      priceInHexWei: getGasPriceInHexWei(average),
     },
     {
       labelKey: 'fast',
-      feeInPrimaryCurrency: getRenderableEthFee(fastest, gasLimit),
+      feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit),
       feeInSecondaryCurrency: showFiat
-        ? getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate)
+        ? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
         : '',
-      timeEstimate: fastestWait && getRenderableTimeEstimate(fastestWait),
-      priceInHexWei: getGasPriceInHexWei(fastest),
+      timeEstimate: fastWait && getRenderableTimeEstimate(fastWait),
+      priceInHexWei: getGasPriceInHexWei(fast),
     },
   ]
 }
@@ -294,8 +294,8 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {
     gas: {
       basicEstimates: {
         safeLow,
+        average,
         fast,
-        fastest,
       },
     },
   } = state
@@ -312,18 +312,18 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {
     {
       labelKey: 'average',
       feeInSecondaryCurrency: showFiat
-        ? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
+        ? getRenderableConvertedCurrencyFee(average, gasLimit, currentCurrency, conversionRate)
         : '',
-      feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
-      priceInHexWei: getGasPriceInHexWei(fast, true),
+      feeInPrimaryCurrency: getRenderableEthFee(average, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
+      priceInHexWei: getGasPriceInHexWei(average, true),
     },
     {
       labelKey: 'fast',
       feeInSecondaryCurrency: showFiat
-        ? getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate)
+        ? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
         : '',
-      feeInPrimaryCurrency: getRenderableEthFee(fastest, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
-      priceInHexWei: getGasPriceInHexWei(fastest, true),
+      feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
+      priceInHexWei: getGasPriceInHexWei(fast, true),
     },
   ]
 }