@across-protocol/contracts 3.0.17 → 3.0.19

package/dist/test/svm/SvmSpoke.Bundle.js

@@ -29,11 +29,11 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
 const crypto = __importStar(require("crypto"));
-const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
-const utils_2 = require("../../utils");
-const SvmUtils_1 = require("../../src/SvmUtils");
 const ethers_1 = require("ethers");
+const svm_1 = require("../../src/svm");
+const utils_1 = require("../../utils");
+const SvmSpoke_common_1 = require("./SvmSpoke.common");
+const utils_2 = require("./utils");
 const { provider, program, owner, initializeState, connection, chainId, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.bundle", () => {
     anchor.setProvider(provider);
@@ -144,11 +144,9 @@ describe("svm_spoke.bundle", () => {
             .relayRootBundle(relayerRefundRootArray, slowRelayRootArray)
             .accounts(relayRootBundleAccounts)
             .rpc();
-        // Wait for event processing
-        await new Promise((resolve) => setTimeout(resolve, 1000));
         // Check for the emitted event
-        const events = await (0, utils_1.readEvents)(connection, tx, [program]);
-        const event = events.find((event) => event.name === "relayedRootBundle").data;
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "relayedRootBundle")?.data;
         chai_1.assert.isTrue(event.rootBundleId.toString() === rootBundleId.toString(), "Root bundle ID should match");
         chai_1.assert.isTrue(event.relayerRefundRoot.toString() === relayerRefundRootArray.toString(), "Relayer refund root should match");
         chai_1.assert.isTrue(event.slowRelayRoot.toString() === slowRelayRootArray.toString(), "Slow relay root should match");
@@ -166,7 +164,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -199,16 +197,15 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
-        await program.methods
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        const tx = await program.methods
             .executeRelayerRefundLeaf()
             .accounts(executeRelayerRefundLeafAccounts)
             .remainingAccounts(remainingAccounts)
             .rpc();
         // Verify the ExecutedRelayerRefundRoot event
-        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for event processing
-        let events = await (0, utils_1.readProgramEvents)(connection, program);
-        let event = events.find((event) => event.name === "executedRelayerRefundRoot").data;
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        let event = events.find((event) => event.name === "executedRelayerRefundRoot")?.data;
         // Remove the expectedValues object and use direct assertions
         assertSE(event.amountToReturn, relayerRefundLeaves[0].amountToReturn, "amountToReturn should match");
         assertSE(event.chainId, chainId, "chainId should match");
@@ -221,6 +218,12 @@ describe("svm_spoke.bundle", () => {
         assertSE(event.refundAddresses[1], relayerB.publicKey, "Relayer B address should match");
         chai_1.assert.isFalse(event.deferredRefunds, "deferredRefunds should be false");
         assertSE(event.caller, owner, "caller should match");
+        event = events.find((event) => event.name === "tokensBridged")?.data;
+        assertSE(event.amountToReturn, relayerRefundLeaves[0].amountToReturn, "amountToReturn should match");
+        assertSE(event.chainId, chainId, "chainId should match");
+        assertSE(event.leafId, leaf.leafId, "leafId should match");
+        assertSE(event.l2TokenAddress, mint, "l2TokenAddress should match");
+        assertSE(event.caller, owner, "caller should match");
         const fVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const fRelayerABal = (await connection.getTokenAccountBalance(relayerTA)).value.amount;
         const fRelayerBBal = (await connection.getTokenAccountBalance(relayerTB)).value.amount;
@@ -241,7 +244,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -257,14 +260,14 @@ describe("svm_spoke.bundle", () => {
         const solanaDistributions = 50;
         const evmDistributions = 50;
         const solanaLeafNumber = 13;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: false,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const invalidRelayerRefundLeaf = {
             isSolana: true,
@@ -273,7 +276,7 @@ describe("svm_spoke.bundle", () => {
             amountToReturn: new anchor_1.BN(0),
             mintPublicKey: mint,
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
-            refundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            refundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         };
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[solanaLeafNumber]);
@@ -313,7 +316,7 @@ describe("svm_spoke.bundle", () => {
                 { pubkey: web3_js_1.Keypair.generate().publicKey, isWritable: true, isSigner: false },
             ];
             // Verify valid leaf
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -336,7 +339,7 @@ describe("svm_spoke.bundle", () => {
             systemProgram: anchor_1.web3.SystemProgram.programId,
             program: program.programId,
         };
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         await program.methods
             .executeRelayerRefundLeaf()
             .accounts(executeRelayerRefundLeafAccounts)
@@ -362,7 +365,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, invalidRelayerRefundLeaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, invalidRelayerRefundLeaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -377,14 +380,14 @@ describe("svm_spoke.bundle", () => {
     it("Test Merkle Proof Verification with Mixed Solana and EVM Leaves", async () => {
         const evmDistributions = 5;
         const solanaDistributions = 5;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: true,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const root = merkleTree.getRoot();
         let stateAccountData = await program.account.state.fetch(state);
@@ -422,7 +425,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -449,14 +452,14 @@ describe("svm_spoke.bundle", () => {
     it("Test Merkle Proof Verification with Sorted Solana and EVM Leaves", async () => {
         const evmDistributions = 5;
         const solanaDistributions = 5;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: false,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const root = merkleTree.getRoot();
         let stateAccountData = await program.account.state.fetch(state);
@@ -494,7 +497,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -532,7 +535,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -562,7 +565,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -586,7 +589,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -616,7 +619,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -642,7 +645,7 @@ describe("svm_spoke.bundle", () => {
                 refundAmounts: [relayerRefundAmount],
             });
         }
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = relayerRefundLeaves.map((leaf) => merkleTree.getProof(leaf).map((p) => Array.from(p)));
         let stateAccountData = await program.account.state.fetch(state);
@@ -670,7 +673,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -696,7 +699,7 @@ describe("svm_spoke.bundle", () => {
                     systemProgram: anchor_1.web3.SystemProgram.programId,
                     program: program.programId,
                 };
-                await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+                await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
                 await program.methods
                     .executeRelayerRefundLeaf()
                     .accounts(executeRelayerRefundLeafAccounts)
@@ -822,9 +825,9 @@ describe("svm_spoke.bundle", () => {
                     await program.methods.initializeClaimAccount(mint, tokenOwner).rpc();
                     refundAccounts.push(claimAccount);
                 }
-                refundAmounts.push(new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()));
+                refundAmounts.push(new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()));
             }
-            const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+            const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
                 totalEvmDistributions: evmDistributions,
                 totalSolanaDistributions: testConfig.solanaDistributions,
                 mixLeaves: false,
@@ -876,7 +879,7 @@ describe("svm_spoke.bundle", () => {
                 ])
                 : [];
             // Build the instruction to execute relayer refund leaf and write its instruction args to the data account.
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             const executeInstruction = !testConfig.deferredRefunds
                 ? await program.methods
                     .executeRelayerRefundLeaf()
@@ -901,7 +904,7 @@ describe("svm_spoke.bundle", () => {
             // Add relay refund leaf execution instruction.
             instructions.push(executeInstruction);
             // Execute using ALT.
-            await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, instructions, anchor.AnchorProvider.env().wallet.payer);
+            await (0, svm_1.sendTransactionWithLookupTable)(connection, instructions, anchor.AnchorProvider.env().wallet.payer);
             // Verify all refund account balances (either token or claim accounts).
             await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure account balances have been synced.
             const refundBalances = await Promise.all(refundAccounts.map(async (account) => {
@@ -946,7 +949,7 @@ describe("svm_spoke.bundle", () => {
                 refundAddresses: [],
                 refundAmounts: [],
             });
-            const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+            const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
             const root = merkleTree.getRoot();
             const proof = merkleTree.getProof(relayerRefundLeaves[0]);
             const leaf = relayerRefundLeaves[0];
@@ -970,7 +973,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods.executeRelayerRefundLeaf().accounts(executeRelayerRefundLeafAccounts).rpc();
         };
         const zeroAmountToReturn = new anchor_1.BN(0);
@@ -1003,7 +1006,7 @@ describe("svm_spoke.bundle", () => {
                 refundAmounts: [relayerRefundAmount],
             });
         }
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = relayerRefundLeaves.map((leaf) => merkleTree.getProof(leaf).map((p) => Array.from(p)));
         let stateAccountData = await program.account.state.fetch(state);
@@ -1031,7 +1034,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -1057,7 +1060,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1087,7 +1090,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         // Mismatched refund amount and account length should fail.
         try {
             await program.methods
@@ -1131,7 +1134,7 @@ describe("svm_spoke.bundle", () => {
                 refundAddresses: [relayerA.publicKey, relayerB.publicKey],
                 refundAmounts: [relayerARefund, relayerBRefund],
             });
-            const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+            const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
             const root = merkleTree.getRoot();
             const proof = merkleTree.getProof(relayerRefundLeaves[0]);
             const leaf = relayerRefundLeaves[0];
@@ -1162,7 +1165,7 @@ describe("svm_spoke.bundle", () => {
                 program: program.programId,
             };
             const proofAsNumbers = proof.map((p) => Array.from(p));
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             if (!testConfig.deferredRefunds) {
                 return await program.methods
                     .executeRelayerRefundLeaf()
@@ -1180,16 +1183,14 @@ describe("svm_spoke.bundle", () => {
         };
         it("No deferred refunds in all Token Accounts", async () => {
             const tx = await executeRelayerRefundLeaf({ deferredRefunds: false });
-            await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for event processing
-            const events = await (0, utils_1.readEvents)(connection, tx, [program]);
-            const event = events.find((event) => event.name === "executedRelayerRefundRoot").data;
+            const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+            const event = events.find((event) => event.name === "executedRelayerRefundRoot")?.data;
             chai_1.assert.isFalse(event.deferredRefunds, "deferredRefunds should be false");
         });
         it("Deferred refunds in all Claim Accounts", async () => {
             const tx = await executeRelayerRefundLeaf({ deferredRefunds: true });
-            await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for event processing
-            const events = await (0, utils_1.readEvents)(connection, tx, [program]);
-            const event = events.find((event) => event.name === "executedRelayerRefundRoot").data;
+            const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+            const event = events.find((event) => event.name === "executedRelayerRefundRoot")?.data;
             chai_1.assert.isTrue(event.deferredRefunds, "deferredRefunds should be true");
         });
     });
@@ -1207,7 +1208,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey],
             refundAmounts: [relayerARefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1233,7 +1234,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         // Leaf execution should fail due to insufficient balance.
         try {
             await program.methods
@@ -1281,7 +1282,7 @@ describe("svm_spoke.bundle", () => {
             ]);
             return ethers_1.ethers.utils.keccak256(contentToHash);
         };
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1311,7 +1312,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         try {
             await program.methods
                 .executeRelayerRefundLeaf()
@@ -1321,7 +1322,6 @@ describe("svm_spoke.bundle", () => {
             chai_1.assert.fail("Leaf verification should fail without leading 64 bytes");
         }
         catch (err) {
-            console.log("err", err);
             chai_1.assert.include(err.toString(), "Invalid Merkle proof", "Expected merkle verification to fail");
         }
     });
@@ -1359,7 +1359,7 @@ describe("svm_spoke.bundle", () => {
             ]);
             return ethers_1.ethers.utils.keccak256(contentToHash);
         };
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1389,7 +1389,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         try {
             await program.methods
                 .executeRelayerRefundLeaf()
@@ -1399,7 +1399,6 @@ describe("svm_spoke.bundle", () => {
             chai_1.assert.fail("Leaf verification should fail without leading 64 bytes");
         }
         catch (err) {
-            console.log("err", err);
             chai_1.assert.include(err.toString(), "Invalid Merkle proof", "Expected merkle verification to fail");
         }
     });

package/dist/test/svm/SvmSpoke.Deposit.js

@@ -29,7 +29,7 @@ const ethers_1 = require("ethers");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const { provider, connection, program, owner, seedBalance, initializeState, depositData } = SvmSpoke_common_1.common;
 const { createRoutePda, getVaultAta, assertSE, assert, getCurrentTime, depositQuoteTimeBuffer, fillDeadlineBuffer } = SvmSpoke_common_1.common;
 const maxExclusivityOffsetSeconds = new anchor_1.BN(365 * 24 * 60 * 60); // 1 year in seconds
@@ -85,7 +85,8 @@ describe("svm_spoke.deposit", () => {
             .accounts(calledDepositAccounts)
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
+        return tx;
     };
     beforeEach(async () => {
         ({ state, seed } = await initializeState());
@@ -122,22 +123,20 @@ describe("svm_spoke.deposit", () => {
         depositData.inputAmount = depositData.inputAmount.add(new anchor_1.BN(69));
         // Execute the first deposit_v3 call
         let depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        let events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await approvedDepositV3(depositDataValues);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event
-        const expectedValues1 = { ...depositData, depositId: (0, utils_1.intToU8Array32)(1) }; // Verify the event props emitted match the depositData.
+        const expectedValues1 = { ...depositData, depositId: (0, svm_1.intToU8Array32)(1) }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues1)) {
             if (key === "exclusivityParameter")
                 key = "exclusivityDeadline"; // the prop and the event names differ on this key.
             assertSE(event[key], value, `${key} should match`);
         }
         // Execute the second deposit_v3 call
-        await approvedDepositV3(depositDataValues);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx2 = await approvedDepositV3(depositDataValues);
+        events = await (0, svm_1.readEventsUntilFound)(connection, tx2, [program]);
         event = events[0].data; // 0th event is the latest event.
-        const expectedValues2 = { ...expectedValues1, depositId: (0, utils_1.intToU8Array32)(2) }; // Verify the event props emitted match the depositData.
+        const expectedValues2 = { ...expectedValues1, depositId: (0, svm_1.intToU8Array32)(2) }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues2)) {
             if (key === "exclusivityParameter")
                 key = "exclusivityDeadline"; // the prop and the event names differ on this key.
@@ -286,7 +285,6 @@ describe("svm_spoke.deposit", () => {
             program: program.programId,
         };
         await program.methods.setEnableRoute(inputToken, fakeRouteChainId, true).accounts(fakeSetEnableRouteAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 2000));
         const fakeDepositAccounts = {
             state: fakeState.state,
             route: fakeRoutePda,
@@ -302,13 +300,12 @@ describe("svm_spoke.deposit", () => {
             ...depositData,
             destinationChainId: fakeRouteChainId,
         });
-        await approvedDepositV3(depositDataValues, fakeDepositAccounts);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        let events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await approvedDepositV3(depositDataValues, fakeDepositAccounts);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event.
         const expectedValues = {
             ...{ ...depositData, destinationChainId: fakeRouteChainId },
-            depositId: (0, utils_1.intToU8Array32)(1),
+            depositId: (0, svm_1.intToU8Array32)(1),
         }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues)) {
             if (key === "exclusivityParameter")
@@ -346,9 +343,8 @@ describe("svm_spoke.deposit", () => {
             .accounts(depositAccounts)
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event.
         // Verify the event props emitted match the expected values
         const currentTime = await getCurrentTime(program, state);
@@ -356,7 +352,7 @@ describe("svm_spoke.deposit", () => {
             ...depositData,
             quoteTimestamp: currentTime,
             fillDeadline: currentTime + fillDeadlineOffset,
-            depositId: (0, utils_1.intToU8Array32)(1),
+            depositId: (0, svm_1.intToU8Array32)(1),
         };
         for (let [key, value] of Object.entries(expectedValues)) {
             if (key === "exclusivityParameter")
@@ -407,9 +403,8 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = maxExclusivityOffsetSeconds;
         const depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await approvedDepositV3(depositDataValues);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event
         assertSE(event.exclusivityDeadline, currentTime.add(maxExclusivityOffsetSeconds), "exclusivityDeadline should be current time + offset");
     });
@@ -420,9 +415,8 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = exclusivityDeadlineTimestamp;
         const depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await approvedDepositV3(depositDataValues);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event;
         assertSE(event.exclusivityDeadline, exclusivityDeadlineTimestamp, "exclusivityDeadline should be passed in time");
     });
@@ -433,9 +427,8 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = zeroExclusivity;
         const depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
+        const tx = await approvedDepositV3(depositDataValues);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event;
         assertSE(event.exclusivityDeadline, zeroExclusivity, "Exclusivity deadline should always be 0");
     });
@@ -462,11 +455,10 @@ describe("svm_spoke.deposit", () => {
             .accounts(depositAccounts) // Assuming depositAccounts is already set up correctly
             .instruction();
         const unsafeDepositTx = new web3_js_1.Transaction().add(approveIx, unsafeDepositIx);
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, unsafeDepositTx, [payer, depositor]);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, unsafeDepositTx, [payer, depositor]);
         // Wait for a short period to ensure the event is emitted
-        await new Promise((resolve) => setTimeout(resolve, 500));
         // Read and verify the event
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // Assuming the latest event is the one we want
         const expectedValues = { ...depositData, depositId: expectedDepositIdArray };
         for (let [key, value] of Object.entries(expectedValues)) {