Add "fees" and "liveness" into the smartTransactionsState, update ver…

…sion (#41)

* Add "fees" and "liveness" into the smartTransactionsState, update version

* Fix UTs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/smart-transactions-controller",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "MetaMask controller for Smart Transactions.",
   "repository": {
     "type": "git",

src/SmartTransactionsController.test.ts

@@ -249,6 +249,8 @@ describe('SmartTransactionsController', () => {
           [CHAIN_IDS.ETHEREUM]: [],
         },
         userOptIn: undefined,
+        fees: undefined,
+        liveness: true,
       },
     });
   });
@@ -439,6 +441,8 @@ describe('SmartTransactionsController', () => {
             [CHAIN_IDS.ETHEREUM]: [pendingTransaction],
           },
           userOptIn: undefined,
+          fees: undefined,
+          liveness: true,
         },
       });
     });
@@ -470,6 +474,8 @@ describe('SmartTransactionsController', () => {
             ],
           },
           userOptIn: undefined,
+          fees: undefined,
+          liveness: true,
         },
       });
     });

src/SmartTransactionsController.ts

@@ -17,7 +17,7 @@ import {
   UnsignedTransaction,
   SmartTransactionsStatus,
   SmartTransactionStatuses,
-  Fee,
+  Fees,
 } from './types';
 import {
   getAPIRequestURL,
@@ -51,6 +51,8 @@ export interface SmartTransactionsControllerState extends BaseState {
   smartTransactionsState: {
     smartTransactions: Record<string, SmartTransaction[]>;
     userOptIn: boolean | undefined;
+    liveness: boolean | undefined;
+    fees: Fees | undefined;
   };
 }
 
@@ -118,6 +120,8 @@ export default class SmartTransactionsController extends BaseController<
       smartTransactionsState: {
         smartTransactions: {},
         userOptIn: undefined,
+        fees: undefined,
+        liveness: true,
       },
     };
 
@@ -446,15 +450,7 @@ export default class SmartTransactionsController extends BaseController<
     };
   }
 
-  async getFees(
-    unsignedTransaction: UnsignedTransaction,
-  ): Promise<{
-    fees: Fee[];
-    cancelFees: Fee[];
-    feeEstimate: number;
-    gasLimit: number;
-    gasUsed: number;
-  }> {
+  async getFees(unsignedTransaction: UnsignedTransaction): Promise<Fees> {
     const { chainId } = this.config;
 
     const unsignedTransactionWithNonce = await this.addNonceToTransaction(
@@ -464,6 +460,12 @@ export default class SmartTransactionsController extends BaseController<
       method: 'POST',
       body: JSON.stringify({ tx: unsignedTransactionWithNonce }),
     });
+    this.update({
+      smartTransactionsState: {
+        ...this.state.smartTransactionsState,
+        fees: data,
+      },
+    });
 
     return data;
   }
@@ -549,10 +551,23 @@ export default class SmartTransactionsController extends BaseController<
 
   async fetchLiveness(): Promise<boolean> {
     const { chainId } = this.config;
-    const response = await this.fetch(
-      getAPIRequestURL(APIType.LIVENESS, chainId),
-    );
-    return Boolean(response.lastBlock);
+    let liveness = false;
+    try {
+      const response = await this.fetch(
+        getAPIRequestURL(APIType.LIVENESS, chainId),
+      );
+      liveness = Boolean(response.lastBlock);
+    } catch (e) {
+      console.log('"fetchLiveness" API call failed');
+    }
+
+    this.update({
+      smartTransactionsState: {
+        ...this.state.smartTransactionsState,
+        liveness,
+      },
+    });
+    return liveness;
   }
 
   async setStatusRefreshInterval(interval: number): Promise<void> {

src/types.ts

@@ -90,6 +90,14 @@ export interface Fee {
   maxPriorityFeePerGas: number;
 }
 
+export interface Fees {
+  fees: Fee[];
+  cancelFees: Fee[];
+  feeEstimate: number;
+  gasLimit: number;
+  gasUsed: number;
+}
+
 // TODO: maybe grab the type from transactions controller?
 export type UnsignedTransaction = any;