Handle the "cancelled" status, lower status polling interval from 10s to 5s, don't mark a tx as cancelled immediately, track uuid

src/SmartTransactionsController.ts

@@ -39,7 +39,7 @@ const { safelyExecute } = util;
 const SECOND = 1000;
 const MINUTE = SECOND * 60;
 
-export const DEFAULT_INTERVAL = SECOND * 10;
+export const DEFAULT_INTERVAL = SECOND * 5;
 export const CANCELLABLE_INTERVAL = MINUTE;
 
 export interface SmartTransactionsControllerConfig extends BaseConfig {
@@ -235,6 +235,7 @@ export default class SmartTransactionsController extends BaseController<
     }
 
     const sensitiveProperties = {
+      uuid: updatedSmartTransaction.uuid,
       stx_status: updatedSmartTransaction.status,
       token_from_address: updatedSmartTransaction.txParams?.from,
       token_from_symbol: updatedSmartTransaction.sourceTokenSymbol,
@@ -605,21 +606,15 @@ export default class SmartTransactionsController extends BaseController<
     return data;
   }
 
-  // ! This should return if the cancellation was on chain or not (for nonce management)
-  // * After this successful call client must update nonce representative
-  // * in transaction controller external transactions list
-  // ! Ask backend API to make this endpoint a POST
+  // TODO: This should return if the cancellation was on chain or not (for nonce management)
+  // After this successful call client must update nonce representative
+  // in transaction controller external transactions list
   async cancelSmartTransaction(uuid: string): Promise<void> {
     const { chainId } = this.config;
     await this.fetch(getAPIRequestURL(APIType.CANCEL, chainId), {
       method: 'POST',
       body: JSON.stringify({ uuid }),
     });
-
-    this.updateSmartTransaction({
-      uuid,
-      status: SmartTransactionStatuses.CANCELLED_USER_CANCELLED,
-    });
   }
 
   async fetchLiveness(): Promise<boolean> {

src/types.ts

@@ -33,6 +33,7 @@ export enum SmartTransactionStatuses {
   SUCCESS = 'success',
   REVERTED = 'reverted',
   UNKNOWN = 'unknown',
+  CANCELLED = 'cancelled',
   CANCELLED_WOULD_REVERT = 'cancelled_would_revert',
   CANCELLED_TOO_CHEAP = 'cancelled_too_cheap',
   CANCELLED_DEADLINE_MISSED = 'cancelled_deadline_missed',

src/utils.test.ts

@@ -118,6 +118,16 @@ describe('src/utils.js', () => {
       );
     });
 
+    it('returns cancelled if minedTx is cancelled', () => {
+      const statusResponse = {
+        ...createStatusResponse(),
+        minedTx: SmartTransactionMinedTx.CANCELLED,
+      };
+      expect(utils.calculateStatus(statusResponse)).toStrictEqual(
+        SmartTransactionStatuses.CANCELLED,
+      );
+    });
+
     it('returns reverted if minedTx is reverted', () => {
       const statusResponse = {
         ...createStatusResponse(),

src/utils.ts

@@ -81,6 +81,8 @@ export const calculateStatus = (status: SmartTransactionsStatus) => {
     }
   } else if (status?.minedTx === SmartTransactionMinedTx.SUCCESS) {
     return SmartTransactionStatuses.SUCCESS;
+  } else if (status?.minedTx === SmartTransactionMinedTx.CANCELLED) {
+    return SmartTransactionStatuses.CANCELLED;
   } else if (status?.minedTx === SmartTransactionMinedTx.REVERTED) {
     return SmartTransactionStatuses.REVERTED;
   } else if (status?.minedTx === SmartTransactionMinedTx.UNKNOWN) {

tsconfig.json

@@ -10,7 +10,8 @@
     "rootDir": "src",
     "sourceMap": true,
     "strict": true,
-    "target": "ES2017"
+    "target": "ES2017",
+    "skipLibCheck": true
   },
   "exclude": ["./src/**/*.test.ts"],
   "include": ["./src/**/*.ts"]