pick: feat (bouncer): add swapContext to contract swaps (#4917) (#4920)

bouncer/shared/contract_swap.ts

@@ -24,6 +24,7 @@ import {
 import { getBalance } from './get_balance';
 import { CcmDepositMetadata } from '../shared/new_swap';
 import { send } from './send';
+import { SwapContext, SwapStatus } from './swapping';
 
 const erc20Assets: Asset[] = ['Flip', 'Usdc', 'Usdt', 'ArbUsdc'];
 
@@ -80,8 +81,9 @@ export async function performSwapViaContract(
   sourceAsset: Asset,
   destAsset: Asset,
   destAddress: string,
-  swapTag?: string,
+  swapTag = '',
   messageMetadata?: CcmDepositMetadata,
+  swapContext?: SwapContext,
 ): Promise<ContractSwapParams> {
   await using api = await getChainflipApi();
 
@@ -114,6 +116,7 @@ export async function performSwapViaContract(
         wallet,
       );
     }
+    swapContext?.updateStatus(swapTag, SwapStatus.ContractApproved);
 
     const oldBalance = await getBalance(destAsset, destAddress);
     console.log(`${tag} Old balance: ${oldBalance}`);
@@ -131,6 +134,8 @@ export async function performSwapViaContract(
       wallet,
       messageMetadata,
     );
+    swapContext?.updateStatus(swapTag, SwapStatus.ContractExecuted);
+
     await observeEvent('swapping:SwapScheduled', api, (event) => {
       if ('Vault' in event.data.origin) {
         const sourceAssetMatches = sourceAsset === (event.data.sourceAsset as Asset);
@@ -141,6 +146,9 @@ export async function performSwapViaContract(
       // Otherwise it was a swap scheduled by requesting a deposit address
       return false;
     });
+
+    swapContext?.updateStatus(swapTag, SwapStatus.SwapScheduled);
+
     console.log(`${tag} Successfully observed event: swapping: SwapScheduled`);
 
     const ccmEventEmitted = messageMetadata
@@ -158,6 +166,7 @@ export async function performSwapViaContract(
       ccmEventEmitted,
     ]);
     console.log(`${tag} Swap success! New balance: ${newBalance}!`);
+    swapContext?.updateStatus(swapTag, SwapStatus.Success);
     return {
       sourceAsset,
       destAsset,
@@ -166,6 +175,7 @@ export async function performSwapViaContract(
     };
   } catch (err) {
     console.error('err:', err);
+    swapContext?.updateStatus(swapTag, SwapStatus.Failure);
     if (err instanceof Error) {
       console.log(err.stack);
     }

bouncer/shared/perform_swap.ts

@@ -138,6 +138,8 @@ export async function doPerformSwap(
 
   await swapScheduledHandle;
 
+  swapContext?.updateStatus(tag, SwapStatus.SwapScheduled);
+
   if (log) console.log(`${tag} Waiting for balance to update`);
 
   try {

bouncer/shared/swapping.ts

@@ -26,6 +26,10 @@ enum SolidityType {
 export enum SwapStatus {
   Initiated,
   Funded,
+  // Contract swap specific statuses
+  ContractApproved,
+  ContractExecuted,
+  SwapScheduled,
   Success,
   Failure,
 }
@@ -175,7 +179,14 @@ export async function testSwapViaContract(
   );
 
   swapContext?.updateStatus(tag, SwapStatus.Initiated);
-  return performSwapViaContract(sourceAsset, destAsset, destAddress, tag, messageMetadata);
+  return performSwapViaContract(
+    sourceAsset,
+    destAsset,
+    destAddress,
+    tag,
+    messageMetadata,
+    swapContext,
+  );
 }
 
 export class SwapContext {
@@ -198,8 +209,29 @@ export class SwapContext {
         assert(currentStatus === SwapStatus.Initiated, `Unexpected status transition for ${tag}`);
         break;
       }
+      case SwapStatus.ContractApproved: {
+        assert(currentStatus === SwapStatus.Initiated, `Unexpected status transition for ${tag}`);
+        break;
+      }
+      case SwapStatus.ContractExecuted: {
+        assert(
+          currentStatus === SwapStatus.ContractApproved,
+          `Unexpected status transition for ${tag}`,
+        );
+        break;
+      }
+      case SwapStatus.SwapScheduled: {
+        assert(
+          currentStatus === SwapStatus.ContractExecuted || currentStatus === SwapStatus.Funded,
+          `Unexpected status transition for ${tag}`,
+        );
+        break;
+      }
       case SwapStatus.Success: {
-        assert(currentStatus === SwapStatus.Funded, `Unexpected status transition for ${tag}`);
+        assert(
+          currentStatus === SwapStatus.SwapScheduled,
+          `Unexpected status transition for ${tag}`,
+        );
         break;
       }
       default: