Third draft of gas fee controller

src/gas/GasFee.controller.ts

@@ -17,18 +17,6 @@ interface LegacyGasFee {
   gasPrice: string; // a GWEI hex number
 }
 
-/**
- * @type Eip1559GasFee
- *
- * Data necessary to provide an estimate of a gas fee with a specific tip
- *
- * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds
- * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds
- * @property suggestedMaxPriorityFeePerGas - A suggested "tip", a GWEI hex number
- * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number
- * @property calculatedTotalMinFee - suggestedMaxPriorityFeePerGas + estimatedNextBlockBaseFee
- */
-
 /**
  * @type LegacyGasPriceEstimates
  *
@@ -45,12 +33,22 @@ interface LegacyGasPriceEstimates {
   high: LegacyGasFee;
 }
 
+/**
+ * @type Eip1559GasFee
+ *
+ * Data necessary to provide an estimate of a gas fee with a specific tip
+ *
+ * @property minWaitTimeEstimate - The fastest the transaction will take, in milliseconds
+ * @property maxWaitTimeEstimate - The slowest the transaction will take, in milliseconds
+ * @property suggestedMaxPriorityFeePerGas - A suggested "tip", a GWEI hex number
+ * @property suggestedMaxFeePerGas - A suggested max fee, the most a user will pay. a GWEI hex number
+ */
+
 interface Eip1559GasFee {
   minWaitTimeEstimate: number; // a time duration in milliseconds
   maxWaitTimeEstimate: number; // a time duration in milliseconds
   suggestedMaxPriorityFeePerGas: string; // a GWEI hex number
   suggestedMaxFeePerGas: string; // a GWEI hex number
-  calculatedTotalMinFee: string; // a GWEI hex number
 }
 
 /**
@@ -62,19 +60,13 @@ interface Eip1559GasFee {
  * @property medium - A GasFee for a recommended combination of tip and maxFee
  * @property high - A GasFee for a high combination of tip and maxFee
  * @property estimatedNextBlockBaseFee - An estimate of what the base fee will be for the pending/next block. A GWEI hex number
- * @property lastBlockBaseFee - The base fee for the most recent block. A GWEI hex number
- * @property lastBlockMinPriorityFee - The lowest tip that succeeded in the most recent block. A GWEI hex number
- * @property lastBlockMaxPriorityFee - The highest tip that succeeded in the most recent block. A GWEI hex number
  */
 
 export interface GasFeeEstimates {
   low: Eip1559GasFee;
   medium: Eip1559GasFee;
   high: Eip1559GasFee;
-  estimatedNextBlockBaseFee: string;
-  lastBlockBaseFee: string;
-  lastBlockMinPriorityFee: string;
-  lastBlockMaxPriorityFee: string;
+  estimatedBaseFee: string;
 }
 
 const metadata = {

src/gas/gas-util.ts

@@ -4,173 +4,138 @@ import { GasFeeEstimates } from './GasFee.controller';
 
 // const GAS_FEE_API = 'https://gas-fee-api-goes-here';
 
-const mockApiResponses = [
+const mockEIP1559ApiResponses = [
   {
     low: {
       minWaitTimeEstimate: 120000,
       maxWaitTimeEstimate: 300000,
       suggestedMaxPriorityFeePerGas: '1',
       suggestedMaxFeePerGas: '35',
-      calculatedTotalMinFee: '31',
     },
     medium: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 30000,
       suggestedMaxPriorityFeePerGas: '2',
       suggestedMaxFeePerGas: '40',
-      calculatedTotalMinFee: '32',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '3',
       suggestedMaxFeePerGas: '60',
-      calculatedTotalMinFee: '33',
     },
-    estimatedNextBlockBaseFee: '30',
-    lastBlockBaseFee: '28',
-    lastBlockMinPriorityFee: '1',
-    lastBlockMaxPriorityFee: '9',
+    estimatedBaseFee: '30',
   },
   {
     low: {
       minWaitTimeEstimate: 180000,
       maxWaitTimeEstimate: 360000,
       suggestedMaxPriorityFeePerGas: '1',
       suggestedMaxFeePerGas: '40',
-      calculatedTotalMinFee: '33',
     },
     medium: {
       minWaitTimeEstimate: 15000,
       maxWaitTimeEstimate: 60000,
       suggestedMaxPriorityFeePerGas: '2',
       suggestedMaxFeePerGas: '45',
-      calculatedTotalMinFee: '34',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '3',
       suggestedMaxFeePerGas: '65',
-      calculatedTotalMinFee: '35',
     },
-    estimatedNextBlockBaseFee: '32',
-    lastBlockBaseFee: '30',
-    lastBlockMinPriorityFee: '1',
-    lastBlockMaxPriorityFee: '10',
+    estimatedBaseFee: '32',
   },
   {
     low: {
       minWaitTimeEstimate: 60000,
       maxWaitTimeEstimate: 240000,
       suggestedMaxPriorityFeePerGas: '1',
       suggestedMaxFeePerGas: '42',
-      calculatedTotalMinFee: '36',
     },
     medium: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 30000,
       suggestedMaxPriorityFeePerGas: '3',
       suggestedMaxFeePerGas: '47',
-      calculatedTotalMinFee: '38',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '4',
       suggestedMaxFeePerGas: '67',
-      calculatedTotalMinFee: '39',
     },
-    estimatedNextBlockBaseFee: '35',
-    lastBlockBaseFee: '32',
-    lastBlockMinPriorityFee: '1',
-    lastBlockMaxPriorityFee: '10',
+    estimatedBaseFee: '35',
   },
   {
     low: {
       minWaitTimeEstimate: 180000,
       maxWaitTimeEstimate: 300000,
       suggestedMaxPriorityFeePerGas: '3',
       suggestedMaxFeePerGas: '53',
-      calculatedTotalMinFee: '53',
     },
     medium: {
       minWaitTimeEstimate: 15000,
       maxWaitTimeEstimate: 60000,
       suggestedMaxPriorityFeePerGas: '7',
       suggestedMaxFeePerGas: '70',
-      calculatedTotalMinFee: '57',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '10',
       suggestedMaxFeePerGas: '100',
-      calculatedTotalMinFee: '60',
     },
-    estimatedNextBlockBaseFee: '50',
-    lastBlockBaseFee: '35',
-    lastBlockMinPriorityFee: '2',
-    lastBlockMaxPriorityFee: '15',
+    estimatedBaseFee: '50',
   },
   {
     low: {
       minWaitTimeEstimate: 120000,
       maxWaitTimeEstimate: 360000,
       suggestedMaxPriorityFeePerGas: '1',
       suggestedMaxFeePerGas: '35',
-      calculatedTotalMinFee: '31',
     },
     medium: {
       minWaitTimeEstimate: 15000,
       maxWaitTimeEstimate: 60000,
       suggestedMaxPriorityFeePerGas: '3',
       suggestedMaxFeePerGas: '40',
-      calculatedTotalMinFee: '33',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '4',
       suggestedMaxFeePerGas: '60',
-      calculatedTotalMinFee: '34',
     },
-    estimatedNextBlockBaseFee: '30',
-    lastBlockBaseFee: '50',
-    lastBlockMinPriorityFee: '4',
-    lastBlockMaxPriorityFee: '25',
+    estimatedBaseFee: '30',
   },
   {
     low: {
       minWaitTimeEstimate: 60000,
       maxWaitTimeEstimate: 600000,
       suggestedMaxPriorityFeePerGas: '1',
       suggestedMaxFeePerGas: '35',
-      calculatedTotalMinFee: '31',
     },
     medium: {
       minWaitTimeEstimate: 15000,
       maxWaitTimeEstimate: 60000,
       suggestedMaxPriorityFeePerGas: '1.8',
       suggestedMaxFeePerGas: '38',
-      calculatedTotalMinFee: '29.8',
     },
     high: {
       minWaitTimeEstimate: 0,
       maxWaitTimeEstimate: 150000,
       suggestedMaxPriorityFeePerGas: '2',
       suggestedMaxFeePerGas: '50',
-      calculatedTotalMinFee: '30',
     },
-    estimatedNextBlockBaseFee: '28',
-    lastBlockBaseFee: '28',
-    lastBlockMinPriorityFee: '1',
-    lastBlockMaxPriorityFee: '7',
+    estimatedBaseFee: '28',
   },
 ];
 
-const getMockApiResponse = (): GasFeeEstimates =>
-  mockApiResponses[Math.floor(Math.random() * 6)];
+const getMockApiResponse = (): GasFeeEstimates => {
+  return mockEIP1559ApiResponses[Math.floor(Math.random() * 6)];
+};
 
 export function fetchGasEstimates(): Promise<GasFeeEstimates> {
   // return handleFetch(GAS_FEE_API)