chore: add checks and increase timeout (#3928)

chainflip-io · Aug 31, 2023 · c44279b · c44279b
1 parent 168135f
commit c44279b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bouncer/shared/contract_swap.ts b/bouncer/shared/contract_swap.ts
@@ -93,7 +93,10 @@ export async function performSwapViaContract(
     const receipt = await executeContractSwap(sourceAsset, destAsset, destAddress, messageMetadata);
     await observeEvent('swapping:SwapScheduled', api, (event) => {
       if ('Vault' in event.data.origin) {
-        return event.data.origin.Vault.txHash === receipt.transactionHash;
+        const sourceAssetMatches = sourceAsset === (event.data.sourceAsset.toUpperCase() as Asset);
+        const destAssetMatches = destAsset === (event.data.destinationAsset.toUpperCase() as Asset);
+        const txHashMatches = event.data.origin.Vault.txHash === receipt.transactionHash;
+        return sourceAssetMatches && destAssetMatches && txHashMatches;
       }
       // Otherwise it was a swap scheduled by requesting a deposit address
       return false;

diff --git a/bouncer/shared/utils.ts b/bouncer/shared/utils.ts
@@ -281,7 +281,7 @@ export async function observeBalanceIncrease(
   address: string,
   oldBalance: string,
 ): Promise<number> {
-  for (let i = 0; i < 120; i++) {
+  for (let i = 0; i < 1200; i++) {
     const newBalance = Number(await getBalance(dstCcy as Asset, address));
     if (newBalance > Number(oldBalance)) {
       return newBalance;
@@ -338,7 +338,7 @@ export async function observeEVMEvent(
   // Get the parameter names of the event
   const parameterNames = eventAbi.inputs.map((input) => input.name);
 
-  for (let i = 0; i < 120; i++) {
+  for (let i = 0; i < 1200; i++) {
     if (stopObserve()) return undefined;
     const currentBlockNumber = await web3.eth.getBlockNumber();
     if (currentBlockNumber >= initBlockNumber) {