@across-protocol/contracts 3.0.17 → 3.0.19

package/dist/test/svm/SvmSpoke.Fill.AcrossPlus.js

@@ -27,10 +27,8 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const utils_1 = require("./utils");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_2 = require("./utils");
 const { provider, connection, program, owner, chainId, seedBalance } = SvmSpoke_common_1.common;
 const { initializeState, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.fill.across_plus", () => {
@@ -45,7 +43,7 @@ describe("svm_spoke.fill.across_plus", () => {
     let accounts; // Store accounts to simplify contract interactions.
     function updateRelayData(newRelayData) {
         relayData = newRelayData;
-        const relayHashUint8Array = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHashUint8Array = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
         accounts = {
             state,
@@ -67,11 +65,11 @@ describe("svm_spoke.fill.across_plus", () => {
             { pubkey: handlerProgram.programId, isSigner: false, isWritable: false },
             ...multicallHandlerCoder.compiledKeyMetas,
         ];
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         // Prepare fill instruction.
         const fillV3RelayValues = [relayHash, relayData, new anchor_1.BN(1), relayer.publicKey];
         if (bufferParams) {
-            await (0, utils_2.loadFillV3RelayParams)(program, relayer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+            await (0, svm_1.loadFillV3RelayParams)(program, relayer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
             [accounts.instructionParams] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("instruction_params"), relayer.publicKey.toBuffer()], program.programId);
         }
         const fillV3RelayParams = bufferParams
@@ -105,7 +103,7 @@ describe("svm_spoke.fill.across_plus", () => {
             inputAmount: new anchor_1.BN(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
-            depositId: (0, utils_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
+            depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
             fillDeadline: new anchor_1.BN(Math.floor(Date.now() / 1000) + 60), // 1 minute from now
             exclusivityDeadline: new anchor_1.BN(Math.floor(Date.now() / 1000) + 30), // 30 seconds from now
             message: Buffer.from(""), // Will be populated in the tests below.
@@ -116,9 +114,9 @@ describe("svm_spoke.fill.across_plus", () => {
         const iRelayerBal = (await (0, spl_token_1.getAccount)(connection, relayerATA)).amount;
         // Construct ix to transfer all tokens from handler to the final recipient.
         const transferIx = (0, spl_token_1.createTransferCheckedInstruction)(handlerATA, mint, finalRecipientATA, handlerSigner, relayData.outputAmount, mintDecimals);
-        const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder([transferIx]);
+        const multicallHandlerCoder = new svm_1.MulticallHandlerCoder([transferIx]);
         const handlerMessage = multicallHandlerCoder.encode();
-        const message = new SvmUtils_1.AcrossPlusMessageCoder({
+        const message = new svm_1.AcrossPlusMessageCoder({
             handler: handlerProgram.programId,
             readOnlyLen: multicallHandlerCoder.readOnlyLen,
             valueAmount: new anchor_1.BN(0),
@@ -153,9 +151,9 @@ describe("svm_spoke.fill.across_plus", () => {
                 const transferInstruction = (0, spl_token_1.createTransferCheckedInstruction)(handlerATA, mint, recipientATA, handlerSigner, distributionAmount, mintDecimals);
                 transferInstructions.push(transferInstruction);
             }
-            const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder(transferInstructions);
+            const multicallHandlerCoder = new svm_1.MulticallHandlerCoder(transferInstructions);
             const handlerMessage = multicallHandlerCoder.encode();
-            const message = new SvmUtils_1.AcrossPlusMessageCoder({
+            const message = new svm_1.AcrossPlusMessageCoder({
                 handler: handlerProgram.programId,
                 readOnlyLen: multicallHandlerCoder.readOnlyLen,
                 valueAmount: new anchor_1.BN(0),
@@ -174,9 +172,9 @@ describe("svm_spoke.fill.across_plus", () => {
             const { approveIx, fillIx } = await createApproveAndFillIx(multicallHandlerCoder, bufferParams);
             // Fill using the ALT.
             const computeBudgetIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 1_400_000 });
-            await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, approveIx, fillIx], relayer);
+            await (0, svm_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, approveIx, fillIx], relayer);
             // Verify relayer's balance after the fill
-            await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure token transfers get processed.
+            await new Promise((resolve) => setTimeout(resolve, 500)); // Make sure token transfers get processed.
             const fRelayerBal = (await (0, spl_token_1.getAccount)(connection, relayerATA)).amount;
             assertSE(fRelayerBal, iRelayerBal - BigInt(distributionAmount * numberOfDistributions), "Relayer's balance should be reduced by the relay amount");
             // Verify all recipient account balances after the fill.
@@ -200,9 +198,9 @@ describe("svm_spoke.fill.across_plus", () => {
     it("Sends lamports from the relayer to value recipient", async () => {
         const valueAmount = new anchor_1.BN(1_000_000_000);
         const valueRecipient = web3_js_1.Keypair.generate().publicKey;
-        const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder([], valueRecipient);
+        const multicallHandlerCoder = new svm_1.MulticallHandlerCoder([], valueRecipient);
         const handlerMessage = multicallHandlerCoder.encode();
-        const message = new SvmUtils_1.AcrossPlusMessageCoder({
+        const message = new svm_1.AcrossPlusMessageCoder({
             handler: handlerProgram.programId,
             readOnlyLen: multicallHandlerCoder.readOnlyLen,
             valueAmount,
@@ -232,9 +230,9 @@ describe("svm_spoke.fill.across_plus", () => {
         // Construct ix to transfer all tokens from handler to the recipient ATA.
         const transferInstruction = (0, spl_token_1.createTransferCheckedInstruction)(handlerATA, mint, anotherRecipientATA, handlerSigner, relayData.outputAmount, mintDecimals);
         // Encode both instructions with handler PDA as the payer for ATA initialization.
-        const multicallHandlerCoder = new SvmUtils_1.MulticallHandlerCoder([createTokenAccountInstruction, transferInstruction], handlerSigner);
+        const multicallHandlerCoder = new svm_1.MulticallHandlerCoder([createTokenAccountInstruction, transferInstruction], handlerSigner);
         const handlerMessage = multicallHandlerCoder.encode();
-        const message = new SvmUtils_1.AcrossPlusMessageCoder({
+        const message = new svm_1.AcrossPlusMessageCoder({
             handler: handlerProgram.programId,
             readOnlyLen: multicallHandlerCoder.readOnlyLen,
             valueAmount: new anchor_1.BN(valueAmount), // Must exactly cover ATA creation.
@@ -248,7 +246,7 @@ describe("svm_spoke.fill.across_plus", () => {
         // Prepare approval and fill instructions as we will need to use Address Lookup Table (ALT).
         const { approveIx, fillIx } = await createApproveAndFillIx(multicallHandlerCoder);
         // Fill using the ALT.
-        await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, [approveIx, fillIx], relayer);
+        await (0, svm_1.sendTransactionWithLookupTable)(connection, [approveIx, fillIx], relayer);
         // Verify recipient's balance after the fill
         await new Promise((resolve) => setTimeout(resolve, 500)); // Make sure token transfer gets processed.
         const anotherRecipientAccount = await (0, spl_token_1.getAccount)(connection, anotherRecipientATA);

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

@@ -27,10 +27,9 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
-const SvmUtils_1 = require("../../src/SvmUtils");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 const { provider, connection, program, owner, chainId, seedBalance } = SvmSpoke_common_1.common;
 const { recipient, initializeState, setCurrentTime, assertSE, assert } = SvmSpoke_common_1.common;
 describe("svm_spoke.fill", () => {
@@ -38,7 +37,7 @@ describe("svm_spoke.fill", () => {
     const payer = anchor.AnchorProvider.env().wallet.payer;
     const relayer = web3_js_1.Keypair.generate();
     const otherRelayer = web3_js_1.Keypair.generate();
-    const { encodedMessage, fillRemainingAccounts } = (0, utils_2.testAcrossPlusMessage)();
+    const { encodedMessage, fillRemainingAccounts } = (0, utils_1.testAcrossPlusMessage)();
     const tokenDecimals = 6;
     let state, mint, relayerTA, recipientTA, otherRelayerTA, tokenProgram;
     const relayAmount = 500000;
@@ -46,7 +45,7 @@ describe("svm_spoke.fill", () => {
     let accounts; // Store accounts to simplify contract interactions.
     function updateRelayData(newRelayData) {
         relayData = newRelayData;
-        const relayHashUint8Array = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHashUint8Array = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
         accounts = {
             state,
@@ -71,7 +70,8 @@ describe("svm_spoke.fill", () => {
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
         const fillTx = new web3_js_1.Transaction().add(approveIx, fillIx);
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, fillTx, [payer, callingRelayer]);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, fillTx, [payer, callingRelayer]);
+        return tx;
     };
     before("Funds relayer wallets", async () => {
         await connection.requestAirdrop(relayer.publicKey, 10_000_000_000); // 10 SOL
@@ -99,7 +99,7 @@ describe("svm_spoke.fill", () => {
             inputAmount: new anchor_1.BN(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
-            depositId: (0, utils_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
+            depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // force that we always have a new deposit id.
             fillDeadline: Math.floor(Date.now() / 1000) + 60, // 1 minute from now
             exclusivityDeadline: Math.floor(Date.now() / 1000) + 30, // 30 seconds from now
             message: encodedMessage,
@@ -113,7 +113,7 @@ describe("svm_spoke.fill", () => {
         // Verify relayer's balance before the fill
         let relayerAccount = await (0, spl_token_1.getAccount)(connection, relayerTA);
         assertSE(relayerAccount.amount, seedBalance, "Relayer's balance should be equal to seed balance before the fill");
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Verify relayer's balance after the fill
         relayerAccount = await (0, spl_token_1.getAccount)(connection, relayerTA);
@@ -123,24 +123,23 @@ describe("svm_spoke.fill", () => {
         assertSE(recipientAccount.amount, relayAmount, "Recipient's balance should be increased by the relay amount");
     });
     it("Verifies FilledV3Relay event after filling a relay", async () => {
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const tx = await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
         // Fetch and verify the FilledV3Relay event
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, SvmUtils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "filledV3Relay").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "filledV3Relay")?.data;
         assert.isNotNull(event, "FilledV3Relay event should be emitted");
         // Verify that the event data matches the relay data.
         Object.entries(relayData).forEach(([key, value]) => {
             if (key === "message") {
-                assertSE(event.messageHash, (0, utils_2.hashNonEmptyMessage)(value), `MessageHash should match`);
+                assertSE(event.messageHash, (0, svm_1.hashNonEmptyMessage)(value), `MessageHash should match`);
             }
             else
                 assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
         });
         // RelayExecutionInfo should match.
         assertSE(event.relayExecutionInfo.updatedRecipient, relayData.recipient, "UpdatedRecipient should match");
-        assertSE(event.relayExecutionInfo.updatedMessageHash, (0, utils_2.hashNonEmptyMessage)(relayData.message), "UpdatedMessageHash should match");
+        assertSE(event.relayExecutionInfo.updatedMessageHash, (0, svm_1.hashNonEmptyMessage)(relayData.message), "UpdatedMessageHash should match");
         assertSE(event.relayExecutionInfo.updatedOutputAmount, relayData.outputAmount, "UpdatedOutputAmount should match");
         assert.equal(JSON.stringify(event.relayExecutionInfo.fillType), `{"fastFill":{}}`, "FillType should be FastFill");
         // These props below are not part of relayData.
@@ -149,7 +148,7 @@ describe("svm_spoke.fill", () => {
     });
     it("Fails to fill a V3 relay after the fill deadline", async () => {
         updateRelayData({ ...relayData, fillDeadline: Math.floor(Date.now() / 1000) - 69 }); // 69 seconds ago
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
             await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to fill deadline passed");
@@ -161,7 +160,7 @@ describe("svm_spoke.fill", () => {
     it("Fails to fill a V3 relay by non-exclusive relayer before exclusivity deadline", async () => {
         accounts.signer = otherRelayer.publicKey;
         accounts.relayerTokenAccount = otherRelayerTA;
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
             await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey], undefined, otherRelayer);
             assert.fail("Fill should have failed due to non-exclusive relayer before exclusivity deadline");
@@ -176,7 +175,7 @@ describe("svm_spoke.fill", () => {
         accounts.relayerTokenAccount = otherRelayerTA;
         const recipientAccountBefore = await (0, spl_token_1.getAccount)(connection, recipientTA);
         const relayerAccountBefore = await (0, spl_token_1.getAccount)(connection, otherRelayerTA);
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey], undefined, otherRelayer);
         // Verify relayer's balance after the fill
         const relayerAccountAfter = await (0, spl_token_1.getAccount)(connection, otherRelayerTA);
@@ -186,7 +185,7 @@ describe("svm_spoke.fill", () => {
         assertSE(recipientAccountAfter.amount, BigInt(recipientAccountBefore.amount) + BigInt(relayAmount), "Recipient's balance should be increased by the relay amount");
     });
     it("Fails to fill a V3 relay with the same deposit data multiple times", async () => {
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         // First fill attempt
         await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Second fill attempt with the same data
@@ -199,7 +198,7 @@ describe("svm_spoke.fill", () => {
         }
     });
     it("Closes the fill PDA after the fill", async () => {
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         const closeFillPdaAccounts = {
             state,
             signer: relayer.publicKey,
@@ -213,7 +212,7 @@ describe("svm_spoke.fill", () => {
         assert.isNotNull(fillStatusAccountBefore, "Fill PDA should exist before closing");
         // Attempt to close the fill PDA before the fill deadline should fail.
         try {
-            await program.methods.closeFillPda(relayHash, relayData).accounts(closeFillPdaAccounts).signers([relayer]).rpc();
+            await program.methods.closeFillPda().accounts(closeFillPdaAccounts).signers([relayer]).rpc();
             assert.fail("Closing fill PDA should have failed before fill deadline");
         }
         catch (err) {
@@ -222,13 +221,13 @@ describe("svm_spoke.fill", () => {
         // Set the current time to past the fill deadline
         await setCurrentTime(program, state, relayer, new anchor_1.BN(relayData.fillDeadline + 1));
         // Close the fill PDA
-        await program.methods.closeFillPda(relayHash, relayData).accounts(closeFillPdaAccounts).signers([relayer]).rpc();
+        await program.methods.closeFillPda().accounts(closeFillPdaAccounts).signers([relayer]).rpc();
         // Verify the fill PDA is closed
         const fillStatusAccountAfter = await connection.getAccountInfo(accounts.fillStatus);
         assert.isNull(fillStatusAccountAfter, "Fill PDA should be closed after closing");
     });
     it("Fetches FillStatusAccount before and after fillV3Relay", async () => {
-        const relayHash = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHash], program.programId);
         // Fetch FillStatusAccount before fillV3Relay
         let fillStatusAccount = await program.account.fillStatusAccount.fetchNullable(fillStatusPDA);
@@ -248,7 +247,7 @@ describe("svm_spoke.fill", () => {
         const stateAccountData = await program.account.state.fetch(state);
         assert.isTrue(stateAccountData.pausedFills, "Fills should be paused");
         // Try to fill the relay. This should fail because fills are paused.
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
             await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Should not be able to fill relay when fills are paused");
@@ -258,7 +257,7 @@ describe("svm_spoke.fill", () => {
         }
     });
     it("Fails to fill a relay to wrong recipient token account", async () => {
-        const relayHash = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         // Create new accounts as derived from wrong recipient.
         const wrongRecipient = web3_js_1.Keypair.generate().publicKey;
         const wrongRecipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, wrongRecipient)).address;
@@ -276,7 +275,7 @@ describe("svm_spoke.fill", () => {
         }
     });
     it("Fails to fill a relay for mint inconsistent output_token", async () => {
-        const relayHash = (0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         // Create and fund new accounts as derived from wrong mint account.
         const wrongMint = await (0, spl_token_1.createMint)(connection, payer, owner, owner, tokenDecimals);
         const wrongRecipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, wrongMint, recipient)).address;
@@ -302,7 +301,7 @@ describe("svm_spoke.fill", () => {
         accounts.recipientTokenAccount = relayerTA;
         // Store relayer's balance before the fill
         const iRelayerBalance = (await (0, spl_token_1.getAccount)(connection, relayerTA)).amount;
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         // No need for approval in self-relay.
         const txSignature = await program.methods
             .fillV3Relay(relayHash, relayData, new anchor_1.BN(1), relayer.publicKey)
@@ -334,7 +333,7 @@ describe("svm_spoke.fill", () => {
         const iRecipientBal = (await (0, spl_token_1.getAccount)(connection, recipientTA)).amount;
         // Fill relay from custom relayer token account
         accounts.relayerTokenAccount = customRelayerTA;
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Verify balances after the fill
         const fRelayerBal = (await (0, spl_token_1.getAccount)(connection, customRelayerTA)).amount;
@@ -350,11 +349,11 @@ describe("svm_spoke.fill", () => {
         const newRelayData = {
             ...relayData,
             recipient: newRecipient,
-            depositId: (0, utils_1.intToU8Array32)(Math.floor(Math.random() * 1000000)),
+            depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)),
         };
         updateRelayData(newRelayData);
         accounts.recipientTokenAccount = newRecipientATA;
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(newRelayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(newRelayData, chainId));
         try {
             await approvedFillV3Relay([relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to missing ATA");
@@ -409,12 +408,12 @@ describe("svm_spoke.fill", () => {
             const newRelayData = {
                 ...relayData,
                 recipient: recipientAuthorities[i],
-                depositId: (0, utils_1.intToU8Array32)(Math.floor(Math.random() * 1000000)),
+                depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)),
             };
             totalFillAmount = totalFillAmount.add(newRelayData.outputAmount);
             updateRelayData(newRelayData);
             accounts.recipientTokenAccount = recipientAssociatedTokens[i];
-            const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(newRelayData, chainId));
+            const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(newRelayData, chainId));
             const fillInstruction = await program.methods
                 .fillV3Relay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
                 .accounts(accounts)
@@ -424,9 +423,9 @@ describe("svm_spoke.fill", () => {
         }
         const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, accounts.state, accounts.signer, BigInt(totalFillAmount.toString()), tokenDecimals, undefined, tokenProgram);
         // Fill using the ALT.
-        await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, [createTokenAccountsInstruction, approveInstruction, ...fillInstructions], relayer);
+        await (0, svm_1.sendTransactionWithLookupTable)(connection, [createTokenAccountsInstruction, approveInstruction, ...fillInstructions], relayer);
         // Verify balances after the fill
-        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for tx processing
+        await new Promise((resolve) => setTimeout(resolve, 500)); // Wait for tx processing
         const fRelayerBal = (await (0, spl_token_1.getAccount)(connection, relayerTA)).amount;
         assertSE(fRelayerBal, iRelayerBal - BigInt(relayAmount * numberOfFills), "Relayer's balance should be reduced by total relay amount");
         recipientAssociatedTokens.forEach(async (recipientAssociatedToken) => {
@@ -454,7 +453,7 @@ describe("svm_spoke.fill", () => {
         // Verify relayer's balance before the fill
         let relayerAccount = await (0, spl_token_1.getAccount)(connection, relayerTA, undefined, tokenProgram);
         assertSE(relayerAccount.amount, seedBalance, "Relayer's balance should be equal to seed balance before the fill");
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Verify relayer's balance after the fill
         relayerAccount = await (0, spl_token_1.getAccount)(connection, relayerTA, undefined, tokenProgram);
@@ -465,12 +464,11 @@ describe("svm_spoke.fill", () => {
     });
     it("Emits zeroed hash for empty message", async () => {
         updateRelayData({ ...relayData, message: Buffer.alloc(0) });
-        const relayHash = Array.from((0, SvmUtils_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const tx = await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
         // Fetch and verify the FilledV3Relay event
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, SvmUtils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "filledV3Relay").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "filledV3Relay")?.data;
         assert.isNotNull(event, "FilledV3Relay event should be emitted");
         // Verify that the event data has zeroed message hash.
         assertSE(event.messageHash, new Uint8Array(32), `MessageHash should be zeroed`);

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

@@ -30,7 +30,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
 const ethers_1 = require("ethers");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const cctpHelpers_1 = require("./cctpHelpers");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const { createRoutePda, getVaultAta, initializeState, crossDomainAdmin, remoteDomain, localDomain } = SvmSpoke_common_1.common;
@@ -262,7 +262,7 @@ describe("svm_spoke.handle_receive_message", () => {
     });
     it("Sets cross-domain admin remotely", async () => {
         const newCrossDomainAdminAddress = ethers_1.ethers.Wallet.createRandom().address;
-        const newCrossDomainAdminPubkey = (0, SvmUtils_1.evmAddressToPublicKey)(newCrossDomainAdminAddress);
+        const newCrossDomainAdminPubkey = (0, svm_1.evmAddressToPublicKey)(newCrossDomainAdminAddress);
         let calldata = ethereumIface.encodeFunctionData("setCrossDomainAdmin", [newCrossDomainAdminAddress]);
         let messageBody = Buffer.from(calldata.slice(2), "hex");
         let message = (0, cctpHelpers_1.encodeMessageHeader)({

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

@@ -28,7 +28,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const { provider, program, owner, initializeState, crossDomainAdmin, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.ownership", () => {
     anchor.setProvider(provider);
@@ -62,23 +62,21 @@ describe("svm_spoke.ownership", () => {
         chai_1.assert.isFalse((await program.account.state.fetch(state)).pausedDeposits, "Deposits should not be paused");
         // Pause deposits as owner
         const pauseDepositsAccounts = { state, signer: owner, program: program.programId };
-        await program.methods.pauseDeposits(true).accounts(pauseDepositsAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx = await program.methods.pauseDeposits(true).accounts(pauseDepositsAccounts).rpc();
         // Fetch the updated state
         let stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.isTrue(stateAccountData.pausedDeposits, "Deposits should be paused");
         // Verify the PausedDeposits event
-        let events = await (0, utils_1.readProgramEvents)(provider.connection, program);
+        let events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx, [program]);
         let pausedDepositEvents = events.filter((event) => event.name === "pausedDeposits");
         chai_1.assert.isTrue(pausedDepositEvents[0].data.isPaused, "PausedDeposits event should indicate deposits are paused");
         // Unpause deposits as owner
-        await program.methods.pauseDeposits(false).accounts(pauseDepositsAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx2 = await program.methods.pauseDeposits(false).accounts(pauseDepositsAccounts).rpc();
         // Fetch the updated state
         stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.isFalse(stateAccountData.pausedDeposits, "Deposits should not be paused");
         // Verify the PausedDeposits event
-        events = await (0, utils_1.readProgramEvents)(provider.connection, program);
+        events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx2, [program]);
         pausedDepositEvents = events.filter((event) => event.name === "pausedDeposits");
         chai_1.assert.isFalse(pausedDepositEvents[0].data.isPaused, "PausedDeposits event should indicate deposits are unpaused");
         // Try to pause deposits as non-owner
@@ -95,23 +93,21 @@ describe("svm_spoke.ownership", () => {
         chai_1.assert.isFalse((await program.account.state.fetch(state)).pausedFills, "Fills should not be paused");
         // Pause fills as owner
         const pauseFillsAccounts = { state, signer: owner, program: program.programId };
-        await program.methods.pauseFills(true).accounts(pauseFillsAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx = await program.methods.pauseFills(true).accounts(pauseFillsAccounts).rpc();
         // Fetch the updated state
         let stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.isTrue(stateAccountData.pausedFills, "Fills should be paused");
         // Verify the PausedFills event
-        let events = await (0, utils_1.readProgramEvents)(provider.connection, program);
+        let events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx, [program]);
         let pausedFillEvents = events.filter((event) => event.name === "pausedFills");
         chai_1.assert.isTrue(pausedFillEvents[0].data.isPaused, "PausedFills event should indicate fills are paused");
         // Unpause fills as owner
-        await program.methods.pauseFills(false).accounts(pauseFillsAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx2 = await program.methods.pauseFills(false).accounts(pauseFillsAccounts).rpc();
         // Fetch the updated state
         stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.isFalse(stateAccountData.pausedFills, "Fills should not be paused");
         // Verify the PausedFills event
-        events = await (0, utils_1.readProgramEvents)(provider.connection, program);
+        events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx2, [program]);
         pausedFillEvents = events.filter((event) => event.name === "pausedFills");
         chai_1.assert.isFalse(pausedFillEvents[0].data.isPaused, "PausedFills event should indicate fills are unpaused");
         // Try to pause fills as non-owner
@@ -128,7 +124,6 @@ describe("svm_spoke.ownership", () => {
         // Transfer ownership to newOwner
         const transferOwnershipAccounts = { state, signer: owner };
         await program.methods.transferOwnership(newOwner.publicKey).accounts(transferOwnershipAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
         // Verify the new owner
         let stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.equal(stateAccountData.owner.toString(), newOwner.publicKey.toString(), "Ownership should be transferred");
@@ -149,16 +144,15 @@ describe("svm_spoke.ownership", () => {
     it("Sets cross-domain admin", async () => {
         // Set cross-domain admin as owner
         const setCrossDomainAdminAccounts = { state, signer: owner, program: program.programId };
-        await program.methods
+        const tx = await program.methods
             .setCrossDomainAdmin(newCrossDomainAdmin.publicKey)
             .accounts(setCrossDomainAdminAccounts)
             .rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
         // Verify the new cross-domain admin
         let stateAccountData = await program.account.state.fetch(state);
         chai_1.assert.equal(stateAccountData.crossDomainAdmin.toString(), newCrossDomainAdmin.publicKey.toString(), "Cross-domain admin should be set");
         // Verify the SetXDomainAdmin event
-        let events = await (0, utils_1.readProgramEvents)(provider.connection, program);
+        let events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx, [program]);
         let setXDomainAdminEvents = events.filter((event) => event.name === "setXDomainAdmin");
         chai_1.assert.equal(setXDomainAdminEvents[0].data.newAdmin.toString(), newCrossDomainAdmin.publicKey.toString(), "SetXDomainAdmin event should indicate the new admin");
         // Try to set cross-domain admin as non-owner

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

@@ -30,7 +30,7 @@ const chai_1 = require("chai");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
 const spl_token_1 = require("@solana/spl-token");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const { provider, program, owner, initializeState, connection, chainId, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.refund_claims", () => {
     anchor.setProvider(provider);
@@ -69,7 +69,7 @@ describe("svm_spoke.refund_claims", () => {
             refundAddresses: [relayer.publicKey],
             refundAmounts: [relayerRefund],
         });
-        const merkleTree = new MerkleTree_1.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new MerkleTree_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -99,7 +99,7 @@ describe("svm_spoke.refund_claims", () => {
             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);
         await program.methods
             .executeRelayerRefundLeafDeferred()
             .accounts(executeRelayerRefundLeafAccounts)
@@ -142,16 +142,18 @@ describe("svm_spoke.refund_claims", () => {
         const iVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const iRelayerBal = (await connection.getTokenAccountBalance(tokenAccount)).value.amount;
         // Claim refund for the relayer.
-        await program.methods.claimRelayerRefundFor(relayer.publicKey).accounts(claimRelayerRefundAccounts).rpc();
+        const tx = await program.methods
+            .claimRelayerRefundFor(relayer.publicKey)
+            .accounts(claimRelayerRefundAccounts)
+            .rpc();
         // The relayer should have received funds from the vault.
         const fVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const fRelayerBal = (await connection.getTokenAccountBalance(tokenAccount)).value.amount;
         assertSE(BigInt(iVaultBal) - BigInt(fVaultBal), relayerRefund, "Vault balance");
         assertSE(BigInt(fRelayerBal) - BigInt(iRelayerBal), relayerRefund, "Relayer balance");
         // Verify the ClaimedRelayerRefund event
-        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for event processing
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "claimedRelayerRefund").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "claimedRelayerRefund")?.data;
         assertSE(event.l2TokenAddress, mint, "l2TokenAddress should match");
         assertSE(event.claimAmount, relayerRefund, "Relayer refund amount should match");
         assertSE(event.refundAddress, relayer.publicKey, "Relayer refund address should match");
@@ -300,16 +302,15 @@ describe("svm_spoke.refund_claims", () => {
         claimRelayerRefundAccounts.tokenAccount = customTokenAccount;
         claimRelayerRefundAccounts.signer = relayer.publicKey; // Only relayer itself should be able to do this.
         // Relayer can claim refund to custom token account.
-        await program.methods.claimRelayerRefund().accounts(claimRelayerRefundAccounts).signers([relayer]).rpc();
+        const tx = await program.methods.claimRelayerRefund().accounts(claimRelayerRefundAccounts).signers([relayer]).rpc();
         // The relayer should have received funds from the vault.
         const fVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const fRelayerBal = (await connection.getTokenAccountBalance(customTokenAccount)).value.amount;
         assertSE(BigInt(iVaultBal) - BigInt(fVaultBal), relayerRefund, "Vault balance");
         assertSE(BigInt(fRelayerBal) - BigInt(iRelayerBal), relayerRefund, "Relayer balance");
         // Verify the ClaimedRelayerRefund event
-        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for event processing
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "claimedRelayerRefund").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "claimedRelayerRefund")?.data;
         assertSE(event.l2TokenAddress, mint, "l2TokenAddress should match");
         assertSE(event.claimAmount, relayerRefund, "Relayer refund amount should match");
         assertSE(event.refundAddress, relayer.publicKey, "Relayer refund address should match");

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

@@ -29,7 +29,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const { provider, program, owner, initializeState, createRoutePda, getVaultAta } = SvmSpoke_common_1.common;
 describe("svm_spoke.routes", () => {
     anchor.setProvider(provider);
@@ -60,25 +60,29 @@ describe("svm_spoke.routes", () => {
     });
     it("Sets, retrieves, and controls access to route enablement", async () => {
         // Enable the route as owner
-        await program.methods.setEnableRoute(tokenMint, routeChainId, true).accounts(setEnableRouteAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx = await program.methods
+            .setEnableRoute(tokenMint, routeChainId, true)
+            .accounts(setEnableRouteAccounts)
+            .rpc();
         // Retrieve and verify the route is enabled
         let routeAccount = await program.account.route.fetch(routePda);
         chai_1.assert.isTrue(routeAccount.enabled, "Route should be enabled");
         // Verify the enabledDepositRoute event
-        let events = (await (0, utils_1.readProgramEvents)(provider.connection, program)).filter((event) => event.name === "enabledDepositRoute");
+        let events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx, [program]);
         let event = events[0].data;
         chai_1.assert.strictEqual(event.originToken.toString(), tokenMint.toString(), "originToken event match");
         chai_1.assert.strictEqual(event.destinationChainId.toString(), routeChainId.toString(), "destinationChainId should match");
         chai_1.assert.isTrue(event.enabled, "enabledDepositRoute enabled");
         // Disable the route as owner
-        await program.methods.setEnableRoute(tokenMint, routeChainId, false).accounts(setEnableRouteAccounts).rpc();
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const tx2 = await program.methods
+            .setEnableRoute(tokenMint, routeChainId, false)
+            .accounts(setEnableRouteAccounts)
+            .rpc();
         // Retrieve and verify the route is disabled
         routeAccount = await program.account.route.fetch(routePda);
         chai_1.assert.isFalse(routeAccount.enabled, "Route should be disabled");
         // Verify the enabledDepositRoute event
-        events = (await (0, utils_1.readProgramEvents)(provider.connection, program)).filter((event) => event.name === "enabledDepositRoute");
+        events = await (0, svm_1.readEventsUntilFound)(provider.connection, tx2, [program]);
         event = events[0].data; // take most recent event, index 0.
         chai_1.assert.strictEqual(event.originToken.toString(), tokenMint.toString(), "originToken event match");
         chai_1.assert.strictEqual(event.destinationChainId.toString(), routeChainId.toString(), "destinationChainId should match");