pick: contract swaps shouldn't wait for SwapScheduled (#4948)

chainflip-io · Jun 14, 2024 · 041942e · 041942e
1 parent 78de605
commit 041942e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/bouncer/shared/contract_swap.ts b/bouncer/shared/contract_swap.ts
@@ -8,9 +8,7 @@ import {
 } from '@chainflip/cli';
 import { HDNodeWallet, Wallet, getDefaultProvider } from 'ethers';
 import {
-  getChainflipApi,
   observeBalanceIncrease,
-  observeEvent,
   getContractAddress,
   observeCcmReceived,
   amountToFineAmount,
@@ -85,8 +83,6 @@ export async function performSwapViaContract(
   messageMetadata?: CcmDepositMetadata,
   swapContext?: SwapContext,
 ): Promise<ContractSwapParams> {
-  await using api = await getChainflipApi();
-
   const tag = swapTag ?? '';
 
   const srcChain = chainFromAsset(sourceAsset);
@@ -136,19 +132,6 @@ export async function performSwapViaContract(
     );
     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);
-        const destAssetMatches = destAsset === (event.data.destinationAsset as Asset);
-        const txHashMatches = event.data.origin.Vault.txHash === receipt.hash;
-        return sourceAssetMatches && destAssetMatches && txHashMatches;
-      }
-      // 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

diff --git a/bouncer/shared/swapping.ts b/bouncer/shared/swapping.ts
@@ -229,7 +229,8 @@ export class SwapContext {
       }
       case SwapStatus.Success: {
         assert(
-          currentStatus === SwapStatus.SwapScheduled,
+          currentStatus === SwapStatus.SwapScheduled ||
+            currentStatus === SwapStatus.ContractExecuted,
           `Unexpected status transition for ${tag}`,
         );
         break;