@across-protocol/contracts 3.0.18 → 3.0.19

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,
@@ -100,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,
@@ -114,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);
@@ -124,23 +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));
+        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
-        const events = await (0, SvmUtils_1.readEventsUntilFound)(connection, tx, [program]);
+        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, SvmUtils_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, SvmUtils_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), `{"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,
@@ -228,7 +227,7 @@ describe("svm_spoke.fill", () => {
         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,7 +423,7 @@ 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, 500)); // Wait for tx processing
         const fRelayerBal = (await (0, spl_token_1.getAccount)(connection, relayerTA)).amount;
@@ -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,10 +464,10 @@ 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));
+        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
-        const events = await (0, SvmUtils_1.readEventsUntilFound)(connection, tx, [program]);
+        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.

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);
@@ -67,7 +67,7 @@ describe("svm_spoke.ownership", () => {
         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.readEventsUntilFound)(provider.connection, tx, [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
@@ -76,7 +76,7 @@ describe("svm_spoke.ownership", () => {
         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.readEventsUntilFound)(provider.connection, tx2, [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
@@ -98,7 +98,7 @@ describe("svm_spoke.ownership", () => {
         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.readEventsUntilFound)(provider.connection, tx, [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
@@ -107,7 +107,7 @@ describe("svm_spoke.ownership", () => {
         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.readEventsUntilFound)(provider.connection, tx2, [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
@@ -152,7 +152,7 @@ describe("svm_spoke.ownership", () => {
         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.readEventsUntilFound)(provider.connection, tx, [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)
@@ -152,7 +152,7 @@ describe("svm_spoke.refund_claims", () => {
         assertSE(BigInt(iVaultBal) - BigInt(fVaultBal), relayerRefund, "Vault balance");
         assertSE(BigInt(fRelayerBal) - BigInt(iRelayerBal), relayerRefund, "Relayer balance");
         // Verify the ClaimedRelayerRefund event
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        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");
@@ -309,7 +309,7 @@ describe("svm_spoke.refund_claims", () => {
         assertSE(BigInt(iVaultBal) - BigInt(fVaultBal), relayerRefund, "Vault balance");
         assertSE(BigInt(fRelayerBal) - BigInt(iRelayerBal), relayerRefund, "Relayer balance");
         // Verify the ClaimedRelayerRefund event
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        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");

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);
@@ -68,7 +68,7 @@ describe("svm_spoke.routes", () => {
         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.readEventsUntilFound)(provider.connection, tx, [program]);
+        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");
@@ -82,7 +82,7 @@ describe("svm_spoke.routes", () => {
         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.readEventsUntilFound)(provider.connection, tx2, [program]);
+        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");

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

@@ -29,9 +29,8 @@ 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, setCurrentTime } = SvmSpoke_common_1.common;
 const { initializeState, assertSE, assert } = SvmSpoke_common_1.common;
 describe("svm_spoke.slow_fill.across_plus", () => {
@@ -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;
@@ -280,9 +279,9 @@ describe("svm_spoke.slow_fill.across_plus", () => {
     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 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),
@@ -300,12 +299,12 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         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, SvmUtils_1.sendTransactionWithLookupTable)(connection, [requestIx], 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, SvmUtils_1.sendTransactionWithLookupTable)(connection, [executeIx], relayer);
+        const { txSignature } = await (0, svm_1.sendTransactionWithLookupTable)(connection, [executeIx], relayer);
         await connection.confirmTransaction(txSignature, "confirmed");
         await connection.getTransaction(txSignature, {
             commitment: "confirmed",
@@ -313,11 +312,11 @@ describe("svm_spoke.slow_fill.across_plus", () => {
         });
         // 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, SvmUtils_1.readEventsUntilFound)(connection, txSignature, [program]);
+        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, SvmUtils_1.calculateRelayEventHashUint8Array)(eventData, chainId);
+        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");