@across-protocol/contracts 3.0.17 → 3.0.19

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

@@ -29,11 +29,10 @@ const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
-const { provider, connection, program, owner, chainId } = SvmSpoke_common_1.common;
-const { initializeState, assertSE } = SvmSpoke_common_1.common;
+const { provider, connection, program, owner, chainId, setCurrentTime } = SvmSpoke_common_1.common;
+const { initializeState, assertSE, assert } = SvmSpoke_common_1.common;
 describe("svm_spoke.slow_fill.across_plus", () => {
     anchor.setProvider(provider);
     const payer = anchor.AnchorProvider.env().wallet.payer;
@@ -48,7 +47,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
     const seedBalance = 10_000_000_000;
     async 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 for requestingSlowFill.
         requestAccounts = {
@@ -75,7 +74,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
                 updatedOutputAmount: relayData.outputAmount,
             });
         }
-        const merkleTree = new MerkleTree_1.MerkleTree(slowRelayLeafs, utils_1.slowFillHashFn);
+        const merkleTree = new MerkleTree_1.MerkleTree(slowRelayLeafs, svm_1.slowFillHashFn);
         const slowRelayRoot = merkleTree.getRoot();
         const proof = merkleTree.getProof(slowRelayLeafs[0]);
         const leaf = slowRelayLeafs[0];
@@ -93,7 +92,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
             .accounts(relayRootBundleAccounts)
             .rpc();
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        const relayHash = (0, SvmUtils_1.calculateRelayHashUint8Array)(slowRelayLeaf.relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(slowRelayLeaf.relayData, chainId);
         return { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle };
     };
     const createSlowFillIx = async (multicallHandlerCoder, bufferParams = false) => {
@@ -102,7 +101,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         const requestV3SlowFillValues = [Array.from(relayHash), leaf.relayData];
         let loadRequestParamsInstructions = [];
         if (bufferParams) {
-            loadRequestParamsInstructions = await (0, utils_1.loadRequestV3SlowFillParams)(program, relayer, requestV3SlowFillValues[1]);
+            loadRequestParamsInstructions = await (0, svm_1.loadRequestV3SlowFillParams)(program, relayer, requestV3SlowFillValues[1]);
             [requestAccounts.instructionParams] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("instruction_params"), relayer.publicKey.toBuffer()], program.programId);
         }
         const requestV3SlowFillParams = bufferParams
@@ -136,7 +135,7 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         ];
         let loadExecuteParamsInstructions = [];
         if (bufferParams) {
-            loadExecuteParamsInstructions = await (0, utils_1.loadExecuteV3SlowRelayLeafParams)(program, relayer, executeV3SlowRelayLeafValues[1], executeV3SlowRelayLeafValues[2], executeV3SlowRelayLeafValues[3]);
+            loadExecuteParamsInstructions = await (0, svm_1.loadExecuteV3SlowRelayLeafParams)(program, relayer, executeV3SlowRelayLeafValues[1], executeV3SlowRelayLeafValues[2], executeV3SlowRelayLeafValues[3]);
             [requestAccounts.instructionParams] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("instruction_params"), relayer.publicKey.toBuffer()], program.programId);
         }
         const executeV3SlowRelayLeafParams = bufferParams
@@ -171,7 +170,7 @@ describe("svm_spoke.slow_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)), // Unique ID for each test.
+            depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // Unique ID for each test.
             fillDeadline: Math.floor(Date.now() / 1000) + 60, // 1 minute from now
             exclusivityDeadline: Math.floor(Date.now() / 1000) - 30, // Note we set time in past to avoid exclusivity deadline
             message: Buffer.from(""), // Will be populated in the tests below.
@@ -182,9 +181,9 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         const iVaultBal = (await (0, spl_token_1.getAccount)(connection, vault)).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.toNumber(), tokenDecimals);
-        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),
@@ -220,9 +219,9 @@ describe("svm_spoke.slow_fill.across_plus", () => {
                 const transferInstruction = (0, spl_token_1.createTransferCheckedInstruction)(handlerATA, mint, recipientATA, handlerSigner, distributionAmount, tokenDecimals);
                 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),
@@ -247,14 +246,14 @@ describe("svm_spoke.slow_fill.across_plus", () => {
                     await (0, web3_js_1.sendAndConfirmTransaction)(program.provider.connection, new web3_js_1.Transaction().add(loadRequestParamsInstructions[i]), [relayer]);
                 }
             }
-            await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, requestIx], relayer);
+            await (0, svm_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, requestIx], relayer);
             await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure request tx gets processed.
             if (bufferParams) {
                 for (let i = 0; i < loadExecuteParamsInstructions.length; i += 1) {
                     await (0, web3_js_1.sendAndConfirmTransaction)(program.provider.connection, new web3_js_1.Transaction().add(loadExecuteParamsInstructions[i]), [relayer]);
                 }
             }
-            await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, executeIx], relayer);
+            await (0, svm_1.sendTransactionWithLookupTable)(connection, [computeBudgetIx, executeIx], relayer);
             // Verify vault's balance after the fill
             await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure token transfers get processed.
             const fVaultBal = (await (0, spl_token_1.getAccount)(connection, vault)).amount;
@@ -277,4 +276,61 @@ describe("svm_spoke.slow_fill.across_plus", () => {
             await fillTokenDistributions(numberOfDistributions, true);
         });
     });
+    it("Can recover and close fill status PDA from event data", async () => {
+        // 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.toNumber(), tokenDecimals);
+        const multicallHandlerCoder = new svm_1.MulticallHandlerCoder([transferIx]);
+        const handlerMessage = multicallHandlerCoder.encode();
+        const message = new svm_1.AcrossPlusMessageCoder({
+            handler: handlerProgram.programId,
+            readOnlyLen: multicallHandlerCoder.readOnlyLen,
+            valueAmount: new anchor_1.BN(0),
+            accounts: multicallHandlerCoder.compiledMessage.accountKeys,
+            handlerMessage,
+        });
+        const encodedMessage = message.encode();
+        // Update relay data with the encoded message.
+        const newRelayData = { ...relayData, message: encodedMessage };
+        updateRelayData(newRelayData);
+        // Prepare request and execute slow fill instructions as we will need to use Address Lookup Table (ALT).
+        // Request and execute slow fill.
+        const { loadRequestParamsInstructions, requestIx, loadExecuteParamsInstructions, executeIx } = await createSlowFillIx(multicallHandlerCoder, true);
+        // Fill using the ALT and submit load params transactions.
+        for (let i = 0; i < loadRequestParamsInstructions.length; i += 1) {
+            await (0, web3_js_1.sendAndConfirmTransaction)(program.provider.connection, new web3_js_1.Transaction().add(loadRequestParamsInstructions[i]), [relayer]);
+        }
+        await (0, svm_1.sendTransactionWithLookupTable)(connection, [requestIx], relayer);
+        await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure request tx gets processed.
+        for (let i = 0; i < loadExecuteParamsInstructions.length; i += 1) {
+            await (0, web3_js_1.sendAndConfirmTransaction)(program.provider.connection, new web3_js_1.Transaction().add(loadExecuteParamsInstructions[i]), [relayer]);
+        }
+        const { txSignature } = await (0, svm_1.sendTransactionWithLookupTable)(connection, [executeIx], relayer);
+        await connection.confirmTransaction(txSignature, "confirmed");
+        await connection.getTransaction(txSignature, {
+            commitment: "confirmed",
+            maxSupportedTransactionVersion: 0,
+        });
+        // We don't close ALT here as that would require ~4 minutes between deactivation and closing, but we demonstrate
+        // being able to close the fill status PDA using only event data.
+        const events = await (0, svm_1.readEventsUntilFound)(connection, txSignature, [program]);
+        const eventData = events.find((event) => event.name === "filledV3Relay")?.data;
+        assert.isNotNull(eventData, "FilledV3Relay event should be emitted");
+        // Recover relay hash and derived fill status from event data.
+        const relayHashUint8Array = (0, svm_1.calculateRelayEventHashUint8Array)(eventData, chainId);
+        const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
+        const fillStatusAccount = await program.account.fillStatusAccount.fetch(fillStatusPDA);
+        assert.isTrue("filled" in fillStatusAccount.status, "Fill status account should be marked as filled");
+        assertSE(fillStatusAccount.relayer, relayer.publicKey, "Relayer should match in the fill status");
+        // Set the current time to past the fill deadline
+        await setCurrentTime(program, state, relayer, new anchor_1.BN(fillStatusAccount.fillDeadline + 1));
+        const closeFillPdaAccounts = {
+            signer: relayer.publicKey,
+            state,
+            fillStatus: fillStatusPDA,
+        };
+        await program.methods.closeFillPda().accounts(closeFillPdaAccounts).signers([relayer]).rpc();
+        // Verify the fill PDA is closed
+        const fillStatusAccountAfter = await connection.getAccountInfo(fillStatusPDA);
+        assert.isNull(fillStatusAccountAfter, "Fill PDA should be closed after closing");
+    });
 });

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

@@ -30,6 +30,7 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
+const svm_1 = require("../../src/svm");
 const utils_1 = require("./utils");
 const { provider, connection, program, owner, chainId, seedBalance, initializeState } = SvmSpoke_common_1.common;
 const { recipient, setCurrentTime, assertSE, assert } = SvmSpoke_common_1.common;
@@ -48,7 +49,7 @@ describe("svm_spoke.slow_fill", () => {
     const initialMintAmount = 10_000_000_000;
     async function updateRelayData(newRelayData) {
         relayData = newRelayData;
-        const relayHashUint8Array = (0, utils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHashUint8Array = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         [fillStatus] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
         // recipientTA could be different for each relayData if custom recipient was passed.
         recipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, relayData.recipient)).address;
@@ -88,7 +89,7 @@ describe("svm_spoke.slow_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)), // Unique ID for each test.
+                depositId: (0, svm_1.intToU8Array32)(Math.floor(Math.random() * 1000000)), // Unique ID for each test.
                 fillDeadline: Math.floor(Date.now() / 1000) + 60, // 1 minute from now
                 exclusivityDeadline: Math.floor(Date.now() / 1000) - 30, // Note we set time in past to avoid exclusivity deadline
                 message,
@@ -98,7 +99,7 @@ describe("svm_spoke.slow_fill", () => {
         };
         await updateRelayData(slowRelayLeaf.relayData);
         slowRelayLeafs.push(slowRelayLeaf);
-        const merkleTree = new MerkleTree_1.MerkleTree(slowRelayLeafs, utils_1.slowFillHashFn);
+        const merkleTree = new MerkleTree_1.MerkleTree(slowRelayLeafs, svm_1.slowFillHashFn);
         const slowRelayRoot = merkleTree.getRoot();
         const proof = merkleTree.getProof(slowRelayLeafs[0]);
         const leaf = slowRelayLeafs[0];
@@ -116,7 +117,7 @@ describe("svm_spoke.slow_fill", () => {
             .accounts(relayRootBundleAccounts)
             .rpc();
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        const relayHash = (0, utils_1.calculateRelayHashUint8Array)(slowRelayLeaf.relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(slowRelayLeaf.relayData, chainId);
         return { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle };
     };
     before("Creates token mint and associated token accounts", async () => {
@@ -144,7 +145,7 @@ describe("svm_spoke.slow_fill", () => {
             inputAmount: new anchor_1.BN(relayAmount),
             outputAmount: new anchor_1.BN(relayAmount),
             originChainId: new anchor_1.BN(1),
-            depositId: (0, utils_1.intToU8Array32)(1),
+            depositId: (0, svm_1.intToU8Array32)(1),
             fillDeadline: Math.floor(Date.now() / 1000) + 60, // 1 minute from now
             exclusivityDeadline: Math.floor(Date.now() / 1000) + 30, // 30 seconds from now
             message: encodedMessage,
@@ -153,7 +154,7 @@ describe("svm_spoke.slow_fill", () => {
     });
     it("Requests a V3 slow fill, verify the event & state change", async () => {
         // Attempt to request a slow fill before the exclusivityDeadline
-        const relayHash = Array.from((0, utils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
             await program.methods.requestV3SlowFill(relayHash, relayData).accounts(requestAccounts).signers([relayer]).rpc();
             assert.fail("Request should have failed due to exclusivity deadline not passed");
@@ -163,23 +164,26 @@ describe("svm_spoke.slow_fill", () => {
         }
         // Set the contract time to be after the exclusivityDeadline
         await setCurrentTime(program, state, relayer, new anchor_1.BN(relayData.exclusivityDeadline + 1));
-        await program.methods.requestV3SlowFill(relayHash, relayData).accounts(requestAccounts).signers([relayer]).rpc();
+        const tx = await program.methods
+            .requestV3SlowFill(relayHash, relayData)
+            .accounts(requestAccounts)
+            .signers([relayer])
+            .rpc();
         // Fetch and verify the RequestedV3SlowFill event
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "requestedV3SlowFill").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "requestedV3SlowFill")?.data;
         assert.isNotNull(event, "RequestedV3SlowFill 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_1.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`);
         });
     });
     it("Fails to request a V3 slow fill if the relay has already been filled", async () => {
-        const relayHash = Array.from((0, utils_1.calculateRelayHashUint8Array)(relayData, chainId));
+        const relayHash = Array.from((0, svm_1.calculateRelayHashUint8Array)(relayData, chainId));
         // Fill the relay first
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(fillAccounts.relayerTokenAccount, fillAccounts.mint, fillAccounts.state, fillAccounts.signer, BigInt(relayData.outputAmount.toString()), tokenDecimals);
         const fillIx = await program.methods
@@ -208,7 +212,7 @@ describe("svm_spoke.slow_fill", () => {
         }
     });
     it("Fetches FillStatusAccount before and after requestV3SlowFill", async () => {
-        const relayHash = (0, utils_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 requestV3SlowFill
         let fillStatusAccount = await program.account.fillStatusAccount.fetchNullable(fillStatusPDA);
@@ -228,7 +232,7 @@ describe("svm_spoke.slow_fill", () => {
         assert.equal(fillStatusAccount.relayer.toString(), relayer.publicKey.toString(), "Caller should be set as relayer");
     });
     it("Fails to request a V3 slow fill multiple times for the same fill", async () => {
-        const relayHash = (0, utils_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
         // Set the contract time to be after the exclusivityDeadline
         await setCurrentTime(program, state, relayer, new anchor_1.BN(relayData.exclusivityDeadline + 1));
         // Request a slow fill
@@ -293,28 +297,29 @@ describe("svm_spoke.slow_fill", () => {
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
         const computeBudgetInstruction = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 1_400_000 });
-        await (0, web3_js_1.sendAndConfirmTransaction)(connection, new web3_js_1.Transaction().add(computeBudgetInstruction, ix), [payer]);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, new web3_js_1.Transaction().add(computeBudgetInstruction, ix), [
+            payer,
+        ]);
         // Verify the results
         const fVaultBal = (await connection.getTokenAccountBalance(vault)).value.amount;
         const fRecipientBal = (await connection.getTokenAccountBalance(recipientTA)).value.amount;
         assert.strictEqual(BigInt(iVaultBal) - BigInt(fVaultBal), BigInt(leaf.updatedOutputAmount.toNumber()), "Vault balance should be reduced by relay amount");
         assert.strictEqual(BigInt(fRecipientBal) - BigInt(iRecipientBal), BigInt(leaf.updatedOutputAmount.toNumber()), "Recipient balance should be increased by relay amount");
         // Fetch and verify the FilledV3Relay event
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_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_1.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_1.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), `{"slowFill":{}}`, "FillType should be SlowFill");
         // These props below are not part of relayData.
@@ -333,7 +338,7 @@ describe("svm_spoke.slow_fill", () => {
         assert.isTrue(stateAccountData.pausedFills, "Fills should be paused");
         // Attempt to request a slow fill. This should fail because fills are paused.
         try {
-            const relayHash = (0, utils_1.calculateRelayHashUint8Array)(relayData, chainId);
+            const relayHash = (0, svm_1.calculateRelayHashUint8Array)(relayData, chainId);
             await program.methods
                 .requestV3SlowFill(Array.from(relayHash), relayData)
                 .accounts(requestAccounts)
@@ -531,7 +536,7 @@ describe("svm_spoke.slow_fill", () => {
         // Relay root bundle of slow fill leaf with empty message.
         const { relayHash, leaf, rootBundleId, proofAsNumbers, rootBundle } = await relaySlowFillRootBundle(undefined, undefined, Buffer.alloc(0));
         // Request V3 slow fill
-        await program.methods
+        const tx1 = await program.methods
             .requestV3SlowFill(Array.from(relayHash), leaf.relayData)
             .accounts(requestAccounts)
             .signers([relayer])
@@ -549,19 +554,19 @@ describe("svm_spoke.slow_fill", () => {
             recipientTokenAccount: recipientTA,
             program: program.programId,
         };
-        await program.methods
+        const tx2 = await program.methods
             .executeV3SlowRelayLeaf(Array.from(relayHash), leaf, rootBundleId, proofAsNumbers)
             .accounts(executeSlowRelayLeafAccounts)
             .remainingAccounts(fillRemainingAccounts)
             .rpc();
         // Fetch and verify message hash in the RequestedV3SlowFill and FilledV3Relay events
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
-        const requestEvent = events.find((event) => event.name === "requestedV3SlowFill").data;
-        const fillEvent = events.find((event) => event.name === "filledV3Relay").data;
+        const requestEvents = await (0, svm_1.readEventsUntilFound)(connection, tx1, [program]);
+        const requestEvent = requestEvents.find((event) => event.name === "requestedV3SlowFill")?.data;
         assert.isNotNull(requestEvent, "RequestedV3SlowFill event should be emitted");
-        assert.isNotNull(fillEvent, "FilledV3Relay event should be emitted");
         assertSE(requestEvent.messageHash, new Uint8Array(32), `MessageHash should be zeroed`);
+        const fillEvents = await (0, svm_1.readEventsUntilFound)(connection, tx2, [program]);
+        const fillEvent = fillEvents.find((event) => event.name === "filledV3Relay")?.data;
+        assert.isNotNull(fillEvent, "FilledV3Relay event should be emitted");
         assertSE(fillEvent.messageHash, new Uint8Array(32), `MessageHash should be zeroed`);
         assertSE(fillEvent.relayExecutionInfo.updatedMessageHash, new Uint8Array(32), `UpdatedMessageHash should be zeroed`);
     });

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

@@ -29,9 +29,9 @@ const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const MerkleTree_1 = require("@uma/common/dist/MerkleTree");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
 const chai_1 = require("chai");
 const cctpHelpers_1 = require("./cctpHelpers");
+const svm_1 = require("../../src/svm");
 const { provider, program, owner, initializeState, connection, remoteDomain, chainId, crossDomainAdmin } = SvmSpoke_common_1.common;
 describe("svm_spoke.token_bridge", () => {
     anchor.setProvider(provider);
@@ -45,19 +45,19 @@ describe("svm_spoke.token_bridge", () => {
     before(async () => {
         // token_minter state is pulled from devnet (DBD8hAwLDRQkTsu6EqviaYNGKPnsAMmQonxf7AH8ZcFY) with its
         // token_controller field overridden to test wallet.
-        tokenMinter = (0, utils_1.findProgramAddress)("token_minter", tokenMessengerMinterProgram.programId).publicKey;
+        tokenMinter = (0, svm_1.findProgramAddress)("token_minter", tokenMessengerMinterProgram.programId).publicKey;
         // message_transmitter state is forked from devnet (BWrwSWjbikT3H7qHAkUEbLmwDQoB4ZDJ4wcSEhSPTZCu).
-        messageTransmitter = (0, utils_1.findProgramAddress)("message_transmitter", messageTransmitterProgram.programId).publicKey;
+        messageTransmitter = (0, svm_1.findProgramAddress)("message_transmitter", messageTransmitterProgram.programId).publicKey;
         // token_messenger state is forked from devnet (Afgq3BHEfCE7d78D2XE9Bfyu2ieDqvE24xX8KDwreBms).
-        tokenMessenger = (0, utils_1.findProgramAddress)("token_messenger", tokenMessengerMinterProgram.programId).publicKey;
+        tokenMessenger = (0, svm_1.findProgramAddress)("token_messenger", tokenMessengerMinterProgram.programId).publicKey;
         // Ethereum remote_token_messenger state is forked from devnet (Hazwi3jFQtLKc2ughi7HFXPkpDeso7DQaMR9Ks4afh3j).
-        remoteTokenMessenger = (0, utils_1.findProgramAddress)("remote_token_messenger", tokenMessengerMinterProgram.programId, [
+        remoteTokenMessenger = (0, svm_1.findProgramAddress)("remote_token_messenger", tokenMessengerMinterProgram.programId, [
             remoteDomain.toString(),
         ]).publicKey;
         // PDA for token_messenger_minter to emit DepositForBurn event via CPI.
-        eventAuthority = (0, utils_1.findProgramAddress)("__event_authority", tokenMessengerMinterProgram.programId).publicKey;
+        eventAuthority = (0, svm_1.findProgramAddress)("__event_authority", tokenMessengerMinterProgram.programId).publicKey;
         // PDA, used to check that CCTP sendMessage was called by TokenMessenger
-        tokenMessengerMinterSenderAuthority = (0, utils_1.findProgramAddress)("sender_authority", tokenMessengerMinterProgram.programId).publicKey;
+        tokenMessengerMinterSenderAuthority = (0, svm_1.findProgramAddress)("sender_authority", tokenMessengerMinterProgram.programId).publicKey;
     });
     beforeEach(async () => {
         // Each test will have different state and mint token.
@@ -65,10 +65,10 @@ describe("svm_spoke.token_bridge", () => {
         mint = await (0, spl_token_1.createMint)(connection, payer, owner, owner, 6);
         vault = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, state, true)).address;
         await (0, spl_token_1.mintTo)(connection, payer, mint, vault, provider.publicKey, initialMintAmount);
-        transferLiability = (0, utils_1.findProgramAddress)("transfer_liability", program.programId, [mint]).publicKey;
-        localToken = (0, utils_1.findProgramAddress)("local_token", tokenMessengerMinterProgram.programId, [mint]).publicKey;
+        transferLiability = (0, svm_1.findProgramAddress)("transfer_liability", program.programId, [mint]).publicKey;
+        localToken = (0, svm_1.findProgramAddress)("local_token", tokenMessengerMinterProgram.programId, [mint]).publicKey;
         // add local cctp token
-        const custodyTokenAccount = (0, utils_1.findProgramAddress)("custody", tokenMessengerMinterProgram.programId, [
+        const custodyTokenAccount = (0, svm_1.findProgramAddress)("custody", tokenMessengerMinterProgram.programId, [
             mint,
         ]).publicKey;
         const addLocalTokenAccounts = {
@@ -128,7 +128,7 @@ describe("svm_spoke.token_bridge", () => {
             refundAddresses: [],
             refundAmounts: [],
         });
-        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];
@@ -163,7 +163,7 @@ describe("svm_spoke.token_bridge", () => {
             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();
     };
     it("Bridge all pending tokens to HubPool in single transaction", async () => {
@@ -260,15 +260,13 @@ describe("svm_spoke.token_bridge", () => {
         // Create a new Keypair for the message event data.
         const simpleBridgeMessageSentEventData = anchor_1.web3.Keypair.generate();
         // Perform the bridge operation.
-        await program.methods
+        const tx = await program.methods
             .bridgeTokensToHubPool(new anchor_1.BN(simpleBridgeAmount))
             .accounts({ ...bridgeTokensToHubPoolAccounts, messageSentEventData: simpleBridgeMessageSentEventData.publicKey })
             .signers([simpleBridgeMessageSentEventData])
             .rpc();
-        // Wait for the event to be emitted.
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const events = await (0, utils_1.readProgramEvents)(connection, program);
-        const event = events.find((event) => event.name === "bridgedToHubPool").data;
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events.find((event) => event.name === "bridgedToHubPool")?.data;
         chai_1.assert.isNotNull(event, "BridgedToHubPool event should be emitted");
         chai_1.assert.strictEqual(event.amount.toString(), simpleBridgeAmount.toString(), "Invalid amount");
         chai_1.assert.strictEqual(event.mint.toString(), mint.toString(), "Invalid mint");

package/dist/test/svm/SvmSpoke.common.d.ts

@@ -1,59 +1,11 @@
 import * as anchor from "@coral-xyz/anchor";
 import { BN, Program } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
+import { DepositData } from "../../src/types/svm";
 import { SvmSpoke } from "../../target/types/svm_spoke";
-import { SlowFillLeaf } from "./utils";
 declare function setCurrentTime(program: Program<SvmSpoke>, state: any, signer: anchor.web3.Keypair, newTime: BN): Promise<void>;
 declare function getCurrentTime(program: Program<SvmSpoke>, state: any): Promise<number>;
 declare function assertSE(a: any, b: any, errorMessage: string): void;
-interface DepositData {
-    depositor: PublicKey | null;
-    recipient: PublicKey;
-    inputToken: PublicKey | null;
-    outputToken: PublicKey;
-    inputAmount: BN;
-    outputAmount: BN;
-    destinationChainId: BN;
-    exclusiveRelayer: PublicKey;
-    quoteTimestamp: BN;
-    fillDeadline: BN;
-    exclusivityParameter: BN;
-    message: Buffer;
-}
-export type DepositDataValues = [
-    PublicKey,
-    PublicKey,
-    PublicKey,
-    PublicKey,
-    BN,
-    BN,
-    BN,
-    PublicKey,
-    number,
-    number,
-    number,
-    Buffer
-];
-export type RelayData = {
-    depositor: PublicKey;
-    recipient: PublicKey;
-    exclusiveRelayer: PublicKey;
-    inputToken: PublicKey;
-    outputToken: PublicKey;
-    inputAmount: BN;
-    outputAmount: BN;
-    originChainId: BN;
-    depositId: number[];
-    fillDeadline: number;
-    exclusivityDeadline: number;
-    message: Buffer;
-};
-export type FillDataValues = [number[], RelayData, BN, PublicKey];
-export type FillDataParams = [number[], RelayData | null, BN | null, PublicKey | null];
-export type RequestV3SlowFillDataValues = [number[], RelayData];
-export type RequestV3SlowFillDataParams = [number[], RelayData | null];
-export type ExecuteV3SlowRelayLeafDataValues = [number[], SlowFillLeaf, number, number[][]];
-export type ExecuteV3SlowRelayLeafDataParams = [number[], SlowFillLeaf | null, number | null, number[][] | null];
 export declare const common: {
     provider: anchor.AnchorProvider;
     connection: anchor.web3.Connection;

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

@@ -26,18 +26,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.common = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
-const web3_js_1 = require("@solana/web3.js");
-const ethers_1 = require("ethers");
 const spl_token_1 = require("@solana/spl-token");
-const SvmUtils_1 = require("../../src/SvmUtils");
+const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
+const crypto_1 = require("crypto");
+const ethers_1 = require("ethers");
+const svm_1 = require("../../src/svm");
 const provider = anchor.AnchorProvider.env();
 const program = anchor.workspace.SvmSpoke;
 const owner = provider.wallet.publicKey;
 const chainId = new anchor_1.BN(420);
 const remoteDomain = new anchor_1.BN(0); // Ethereum
 const localDomain = 5; // Solana
-const crossDomainAdmin = (0, SvmUtils_1.evmAddressToPublicKey)(ethers_1.ethers.Wallet.createRandom().address);
+const crossDomainAdmin = (0, svm_1.evmAddressToPublicKey)(ethers_1.ethers.Wallet.createRandom().address);
 const seedBalance = 20000000;
 const destinationChainId = new anchor_1.BN(1);
 const recipient = web3_js_1.Keypair.generate().publicKey;
@@ -52,7 +53,7 @@ const message = Buffer.from("Test message");
 const depositQuoteTimeBuffer = new anchor_1.BN(3600); // 1 hour.
 const fillDeadlineBuffer = new anchor_1.BN(3600 * 4); // 4 hours.
 const initializeState = async (seed, initialState) => {
-    const actualSeed = seed || new anchor_1.BN(Math.floor(Math.random() * 1000000));
+    const actualSeed = seed || new anchor_1.BN((0, crypto_1.randomBytes)(8).toString("hex"), 16); // Generate a random u64
     const seeds = [Buffer.from("state"), actualSeed.toArrayLike(Buffer, "le", 8)];
     const [state] = web3_js_1.PublicKey.findProgramAddressSync(seeds, program.programId);
     if (!initialState) {

package/dist/test/svm/cctpHelpers.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMessages = exports.encodeMessageHeader = exports.decodeTokenMessengerMessageBody = exports.decodeMessageHeader = exports.decodeMessageSentData = void 0;
 const anchor = __importStar(require("@coral-xyz/anchor"));
-const SvmUtils_1 = require("../../src/SvmUtils");
+const svm_1 = require("../../src/svm");
 // Index positions to decode Message Header from
 // https://developers.circle.com/stablecoins/docs/message-format#message-header
 const HEADER_VERSION_INDEX = 0;
@@ -75,7 +75,7 @@ const decodeTokenMessengerMessageBody = (data) => {
     const version = data.readUInt32BE(BODY_VERSION_INDEX);
     const burnToken = new anchor.web3.PublicKey(data.slice(BURN_TOKEN_INDEX, BURN_TOKEN_INDEX + 32));
     const mintRecipient = new anchor.web3.PublicKey(data.slice(MINT_RECIPIENT_INDEX, MINT_RECIPIENT_INDEX + 32));
-    const amount = (0, SvmUtils_1.readUInt256BE)(data.slice(AMOUNT_INDEX, AMOUNT_INDEX + 32));
+    const amount = (0, svm_1.readUInt256BE)(data.slice(AMOUNT_INDEX, AMOUNT_INDEX + 32));
     const messageSender = new anchor.web3.PublicKey(data.slice(MESSAGE_SENDER_INDEX, MESSAGE_SENDER_INDEX + 32));
     return { version, burnToken, mintRecipient, amount, messageSender };
 };