@across-protocol/contracts 3.0.18 → 3.0.19

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

@@ -29,11 +29,11 @@ const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const chai_1 = require("chai");
 const crypto = __importStar(require("crypto"));
-const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
-const utils_2 = require("../../utils");
-const SvmUtils_1 = require("../../src/SvmUtils");
 const ethers_1 = require("ethers");
+const svm_1 = require("../../src/svm");
+const utils_1 = require("../../utils");
+const SvmSpoke_common_1 = require("./SvmSpoke.common");
+const utils_2 = require("./utils");
 const { provider, program, owner, initializeState, connection, chainId, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.bundle", () => {
     anchor.setProvider(provider);
@@ -145,7 +145,7 @@ describe("svm_spoke.bundle", () => {
             .accounts(relayRootBundleAccounts)
             .rpc();
         // Check for the emitted event
-        let events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events.find((event) => event.name === "relayedRootBundle")?.data;
         chai_1.assert.isTrue(event.rootBundleId.toString() === rootBundleId.toString(), "Root bundle ID should match");
         chai_1.assert.isTrue(event.relayerRefundRoot.toString() === relayerRefundRootArray.toString(), "Relayer refund root should match");
@@ -164,7 +164,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -197,14 +197,14 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         const tx = await program.methods
             .executeRelayerRefundLeaf()
             .accounts(executeRelayerRefundLeafAccounts)
             .remainingAccounts(remainingAccounts)
             .rpc();
         // Verify the ExecutedRelayerRefundRoot event
-        let events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events.find((event) => event.name === "executedRelayerRefundRoot")?.data;
         // Remove the expectedValues object and use direct assertions
         assertSE(event.amountToReturn, relayerRefundLeaves[0].amountToReturn, "amountToReturn should match");
@@ -244,7 +244,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -260,14 +260,14 @@ describe("svm_spoke.bundle", () => {
         const solanaDistributions = 50;
         const evmDistributions = 50;
         const solanaLeafNumber = 13;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: false,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const invalidRelayerRefundLeaf = {
             isSolana: true,
@@ -276,7 +276,7 @@ describe("svm_spoke.bundle", () => {
             amountToReturn: new anchor_1.BN(0),
             mintPublicKey: mint,
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
-            refundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            refundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         };
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[solanaLeafNumber]);
@@ -316,7 +316,7 @@ describe("svm_spoke.bundle", () => {
                 { pubkey: web3_js_1.Keypair.generate().publicKey, isWritable: true, isSigner: false },
             ];
             // Verify valid leaf
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -339,7 +339,7 @@ describe("svm_spoke.bundle", () => {
             systemProgram: anchor_1.web3.SystemProgram.programId,
             program: program.programId,
         };
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         await program.methods
             .executeRelayerRefundLeaf()
             .accounts(executeRelayerRefundLeafAccounts)
@@ -365,7 +365,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, invalidRelayerRefundLeaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, invalidRelayerRefundLeaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -380,14 +380,14 @@ describe("svm_spoke.bundle", () => {
     it("Test Merkle Proof Verification with Mixed Solana and EVM Leaves", async () => {
         const evmDistributions = 5;
         const solanaDistributions = 5;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: true,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const root = merkleTree.getRoot();
         let stateAccountData = await program.account.state.fetch(state);
@@ -425,7 +425,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -452,14 +452,14 @@ describe("svm_spoke.bundle", () => {
     it("Test Merkle Proof Verification with Sorted Solana and EVM Leaves", async () => {
         const evmDistributions = 5;
         const solanaDistributions = 5;
-        const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+        const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
             totalEvmDistributions: evmDistributions,
             totalSolanaDistributions: solanaDistributions,
             mixLeaves: false,
             chainId: chainId.toNumber(),
             mint,
             svmRelayers: [relayerA.publicKey, relayerB.publicKey],
-            svmRefundAmounts: [new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_1.randomBigInt)(2).toString())],
+            svmRefundAmounts: [new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()), new anchor_1.BN((0, utils_2.randomBigInt)(2).toString())],
         });
         const root = merkleTree.getRoot();
         let stateAccountData = await program.account.state.fetch(state);
@@ -497,7 +497,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -535,7 +535,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -565,7 +565,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -589,7 +589,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund, relayerBRefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -619,7 +619,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -645,7 +645,7 @@ describe("svm_spoke.bundle", () => {
                 refundAmounts: [relayerRefundAmount],
             });
         }
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = relayerRefundLeaves.map((leaf) => merkleTree.getProof(leaf).map((p) => Array.from(p)));
         let stateAccountData = await program.account.state.fetch(state);
@@ -673,7 +673,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -699,7 +699,7 @@ describe("svm_spoke.bundle", () => {
                     systemProgram: anchor_1.web3.SystemProgram.programId,
                     program: program.programId,
                 };
-                await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+                await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
                 await program.methods
                     .executeRelayerRefundLeaf()
                     .accounts(executeRelayerRefundLeafAccounts)
@@ -825,9 +825,9 @@ describe("svm_spoke.bundle", () => {
                     await program.methods.initializeClaimAccount(mint, tokenOwner).rpc();
                     refundAccounts.push(claimAccount);
                 }
-                refundAmounts.push(new anchor_1.BN((0, utils_1.randomBigInt)(2).toString()));
+                refundAmounts.push(new anchor_1.BN((0, utils_2.randomBigInt)(2).toString()));
             }
-            const { relayerRefundLeaves, merkleTree } = (0, utils_1.buildRelayerRefundMerkleTree)({
+            const { relayerRefundLeaves, merkleTree } = (0, utils_2.buildRelayerRefundMerkleTree)({
                 totalEvmDistributions: evmDistributions,
                 totalSolanaDistributions: testConfig.solanaDistributions,
                 mixLeaves: false,
@@ -879,7 +879,7 @@ describe("svm_spoke.bundle", () => {
                 ])
                 : [];
             // Build the instruction to execute relayer refund leaf and write its instruction args to the data account.
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             const executeInstruction = !testConfig.deferredRefunds
                 ? await program.methods
                     .executeRelayerRefundLeaf()
@@ -904,7 +904,7 @@ describe("svm_spoke.bundle", () => {
             // Add relay refund leaf execution instruction.
             instructions.push(executeInstruction);
             // Execute using ALT.
-            await (0, SvmUtils_1.sendTransactionWithLookupTable)(connection, instructions, anchor.AnchorProvider.env().wallet.payer);
+            await (0, svm_1.sendTransactionWithLookupTable)(connection, instructions, anchor.AnchorProvider.env().wallet.payer);
             // Verify all refund account balances (either token or claim accounts).
             await new Promise((resolve) => setTimeout(resolve, 1000)); // Make sure account balances have been synced.
             const refundBalances = await Promise.all(refundAccounts.map(async (account) => {
@@ -949,7 +949,7 @@ describe("svm_spoke.bundle", () => {
                 refundAddresses: [],
                 refundAmounts: [],
             });
-            const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+            const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
             const root = merkleTree.getRoot();
             const proof = merkleTree.getProof(relayerRefundLeaves[0]);
             const leaf = relayerRefundLeaves[0];
@@ -973,7 +973,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             await program.methods.executeRelayerRefundLeaf().accounts(executeRelayerRefundLeafAccounts).rpc();
         };
         const zeroAmountToReturn = new anchor_1.BN(0);
@@ -1006,7 +1006,7 @@ describe("svm_spoke.bundle", () => {
                 refundAmounts: [relayerRefundAmount],
             });
         }
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = relayerRefundLeaves.map((leaf) => merkleTree.getProof(leaf).map((p) => Array.from(p)));
         let stateAccountData = await program.account.state.fetch(state);
@@ -1034,7 +1034,7 @@ describe("svm_spoke.bundle", () => {
                 systemProgram: anchor_1.web3.SystemProgram.programId,
                 program: program.programId,
             };
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, relayerRefundLeaves[i], proof[i]);
             await program.methods
                 .executeRelayerRefundLeaf()
                 .accounts(executeRelayerRefundLeafAccounts)
@@ -1060,7 +1060,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey, relayerB.publicKey],
             refundAmounts: [relayerARefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1090,7 +1090,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         // Mismatched refund amount and account length should fail.
         try {
             await program.methods
@@ -1134,7 +1134,7 @@ describe("svm_spoke.bundle", () => {
                 refundAddresses: [relayerA.publicKey, relayerB.publicKey],
                 refundAmounts: [relayerARefund, relayerBRefund],
             });
-            const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+            const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
             const root = merkleTree.getRoot();
             const proof = merkleTree.getProof(relayerRefundLeaves[0]);
             const leaf = relayerRefundLeaves[0];
@@ -1165,7 +1165,7 @@ describe("svm_spoke.bundle", () => {
                 program: program.programId,
             };
             const proofAsNumbers = proof.map((p) => Array.from(p));
-            await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+            await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
             if (!testConfig.deferredRefunds) {
                 return await program.methods
                     .executeRelayerRefundLeaf()
@@ -1183,13 +1183,13 @@ describe("svm_spoke.bundle", () => {
         };
         it("No deferred refunds in all Token Accounts", async () => {
             const tx = await executeRelayerRefundLeaf({ deferredRefunds: false });
-            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 === "executedRelayerRefundRoot")?.data;
             chai_1.assert.isFalse(event.deferredRefunds, "deferredRefunds should be false");
         });
         it("Deferred refunds in all Claim Accounts", async () => {
             const tx = await executeRelayerRefundLeaf({ deferredRefunds: true });
-            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 === "executedRelayerRefundRoot")?.data;
             chai_1.assert.isTrue(event.deferredRefunds, "deferredRefunds should be true");
         });
@@ -1208,7 +1208,7 @@ describe("svm_spoke.bundle", () => {
             refundAddresses: [relayerA.publicKey],
             refundAmounts: [relayerARefund],
         });
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, utils_1.relayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, svm_1.relayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1234,7 +1234,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         // Leaf execution should fail due to insufficient balance.
         try {
             await program.methods
@@ -1282,7 +1282,7 @@ describe("svm_spoke.bundle", () => {
             ]);
             return ethers_1.ethers.utils.keccak256(contentToHash);
         };
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1312,7 +1312,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         try {
             await program.methods
                 .executeRelayerRefundLeaf()
@@ -1359,7 +1359,7 @@ describe("svm_spoke.bundle", () => {
             ]);
             return ethers_1.ethers.utils.keccak256(contentToHash);
         };
-        const merkleTree = new utils_2.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
+        const merkleTree = new utils_1.MerkleTree(relayerRefundLeaves, customRelayerRefundHashFn);
         const root = merkleTree.getRoot();
         const proof = merkleTree.getProof(relayerRefundLeaves[0]);
         const leaf = relayerRefundLeaves[0];
@@ -1389,7 +1389,7 @@ describe("svm_spoke.bundle", () => {
             program: program.programId,
         };
         const proofAsNumbers = proof.map((p) => Array.from(p));
-        await (0, utils_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
+        await (0, svm_1.loadExecuteRelayerRefundLeafParams)(program, owner, stateAccountData.rootBundleId, leaf, proofAsNumbers);
         try {
             await program.methods
                 .executeRelayerRefundLeaf()

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

@@ -29,7 +29,7 @@ const ethers_1 = require("ethers");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const utils_1 = require("./utils");
+const svm_1 = require("../../src/svm");
 const { provider, connection, program, owner, seedBalance, initializeState, depositData } = SvmSpoke_common_1.common;
 const { createRoutePda, getVaultAta, assertSE, assert, getCurrentTime, depositQuoteTimeBuffer, fillDeadlineBuffer } = SvmSpoke_common_1.common;
 const maxExclusivityOffsetSeconds = new anchor_1.BN(365 * 24 * 60 * 60); // 1 year in seconds
@@ -124,9 +124,9 @@ describe("svm_spoke.deposit", () => {
         // Execute the first deposit_v3 call
         let depositDataValues = Object.values(depositData);
         const tx = await approvedDepositV3(depositDataValues);
-        let events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event
-        const expectedValues1 = { ...depositData, depositId: (0, utils_1.intToU8Array32)(1) }; // Verify the event props emitted match the depositData.
+        const expectedValues1 = { ...depositData, depositId: (0, svm_1.intToU8Array32)(1) }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues1)) {
             if (key === "exclusivityParameter")
                 key = "exclusivityDeadline"; // the prop and the event names differ on this key.
@@ -134,9 +134,9 @@ describe("svm_spoke.deposit", () => {
         }
         // Execute the second deposit_v3 call
         const tx2 = await approvedDepositV3(depositDataValues);
-        events = await (0, utils_1.readEventsUntilFound)(connection, tx2, [program]);
+        events = await (0, svm_1.readEventsUntilFound)(connection, tx2, [program]);
         event = events[0].data; // 0th event is the latest event.
-        const expectedValues2 = { ...expectedValues1, depositId: (0, utils_1.intToU8Array32)(2) }; // Verify the event props emitted match the depositData.
+        const expectedValues2 = { ...expectedValues1, depositId: (0, svm_1.intToU8Array32)(2) }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues2)) {
             if (key === "exclusivityParameter")
                 key = "exclusivityDeadline"; // the prop and the event names differ on this key.
@@ -301,11 +301,11 @@ describe("svm_spoke.deposit", () => {
             destinationChainId: fakeRouteChainId,
         });
         const tx = await approvedDepositV3(depositDataValues, fakeDepositAccounts);
-        let events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        let events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event.
         const expectedValues = {
             ...{ ...depositData, destinationChainId: fakeRouteChainId },
-            depositId: (0, utils_1.intToU8Array32)(1),
+            depositId: (0, svm_1.intToU8Array32)(1),
         }; // Verify the event props emitted match the depositData.
         for (let [key, value] of Object.entries(expectedValues)) {
             if (key === "exclusivityParameter")
@@ -344,7 +344,7 @@ describe("svm_spoke.deposit", () => {
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
         const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event.
         // Verify the event props emitted match the expected values
         const currentTime = await getCurrentTime(program, state);
@@ -352,7 +352,7 @@ describe("svm_spoke.deposit", () => {
             ...depositData,
             quoteTimestamp: currentTime,
             fillDeadline: currentTime + fillDeadlineOffset,
-            depositId: (0, utils_1.intToU8Array32)(1),
+            depositId: (0, svm_1.intToU8Array32)(1),
         };
         for (let [key, value] of Object.entries(expectedValues)) {
             if (key === "exclusivityParameter")
@@ -404,7 +404,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusivityParameter = maxExclusivityOffsetSeconds;
         const depositDataValues = Object.values(depositData);
         const tx = await approvedDepositV3(depositDataValues);
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event
         assertSE(event.exclusivityDeadline, currentTime.add(maxExclusivityOffsetSeconds), "exclusivityDeadline should be current time + offset");
     });
@@ -416,7 +416,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusivityParameter = exclusivityDeadlineTimestamp;
         const depositDataValues = Object.values(depositData);
         const tx = await approvedDepositV3(depositDataValues);
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event;
         assertSE(event.exclusivityDeadline, exclusivityDeadlineTimestamp, "exclusivityDeadline should be passed in time");
     });
@@ -428,7 +428,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusivityParameter = zeroExclusivity;
         const depositDataValues = Object.values(depositData);
         const tx = await approvedDepositV3(depositDataValues);
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // 0th event is the latest event;
         assertSE(event.exclusivityDeadline, zeroExclusivity, "Exclusivity deadline should always be 0");
     });
@@ -458,7 +458,7 @@ describe("svm_spoke.deposit", () => {
         const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, unsafeDepositTx, [payer, depositor]);
         // Wait for a short period to ensure the event is emitted
         // Read and verify the event
-        const events = await (0, utils_1.readEventsUntilFound)(connection, tx, [program]);
+        const events = await (0, svm_1.readEventsUntilFound)(connection, tx, [program]);
         const event = events[0].data; // Assuming the latest event is the one we want
         const expectedValues = { ...depositData, depositId: expectedDepositIdArray };
         for (let [key, value] of Object.entries(expectedValues)) {

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,7 +172,7 @@ 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, 500)); // Make sure token transfers get processed.
             const fRelayerBal = (await (0, spl_token_1.getAccount)(connection, relayerATA)).amount;
@@ -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);