@across-protocol/contracts 4.0.11 → 4.0.12

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

@@ -36,24 +36,26 @@ const utils_1 = require("./utils");
 const { provider, connection, program, owner, chainId, seedBalance, recipient, initializeState, setCurrentTime, assertSE, assert, } = SvmSpoke_common_1.common;
 describe("svm_spoke.fill", () => {
     anchor.setProvider(provider);
-    const payer = anchor.AnchorProvider.env().wallet.payer;
+    const { payer } = anchor.AnchorProvider.env().wallet;
     const relayer = web3_js_1.Keypair.generate();
     const otherRelayer = web3_js_1.Keypair.generate();
     const { encodedMessage, fillRemainingAccounts } = (0, utils_1.testAcrossPlusMessage)();
     const tokenDecimals = 6;
-    let state, mint, relayerTA, recipientTA, otherRelayerTA, tokenProgram;
+    let state, mint, relayerTA, recipientTA, otherRelayerTA, tokenProgram, seed;
     const relayAmount = 500000;
     let relayData; // reused relay data for all tests.
     let accounts; // Store accounts to simplify contract interactions.
-    function updateRelayData(newRelayData) {
+    const updateRelayData = (newRelayData) => {
         relayData = newRelayData;
         const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
         const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
+        const { pda: delegatePda } = (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId);
         accounts = {
             state,
+            delegate: delegatePda,
             signer: relayer.publicKey,
             instructionParams: program.programId,
-            mint: mint,
+            mint,
             relayerTokenAccount: relayerTA,
             recipientTokenAccount: recipientTA,
             fillStatus: fillStatusPDA,
@@ -62,18 +64,17 @@ describe("svm_spoke.fill", () => {
             systemProgram: anchor.web3.SystemProgram.programId,
             program: program.programId,
         };
-    }
+    };
     const approvedFillRelay = async (fillDataValues, calledFillAccounts = accounts, callingRelayer = relayer) => {
-        // Delegate state PDA to pull relayer tokens.
-        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(calledFillAccounts.relayerTokenAccount, calledFillAccounts.mint, calledFillAccounts.state, calledFillAccounts.signer, BigInt(fillDataValues[1].outputAmount.toString()), tokenDecimals, undefined, tokenProgram);
+        const relayHash = Uint8Array.from(fillDataValues[0]);
+        const { seedHash, pda: delegatePda } = (0, web3_v1_1.getFillRelayDelegatePda)(relayHash, fillDataValues[2], fillDataValues[3], program.programId);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(calledFillAccounts.relayerTokenAccount, calledFillAccounts.mint, delegatePda, calledFillAccounts.signer, BigInt(fillDataValues[1].outputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         const fillIx = await program.methods
             .fillRelay(...fillDataValues)
-            .accounts(calledFillAccounts)
+            .accounts({ ...calledFillAccounts, delegate: delegatePda })
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
-        const fillTx = new web3_js_1.Transaction().add(approveIx, fillIx);
-        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, fillTx, [payer, callingRelayer]);
-        return tx;
+        return (0, web3_js_1.sendAndConfirmTransaction)(connection, new web3_js_1.Transaction().add(approveIx, fillIx), [payer, callingRelayer]);
     };
     before("Funds relayer wallets", async () => {
         await connection.requestAirdrop(relayer.publicKey, 10_000_000_000); // 10 SOL
@@ -90,7 +91,7 @@ describe("svm_spoke.fill", () => {
         await connection.requestAirdrop(otherRelayer.publicKey, 10_000_000_000); // 10 SOL
     });
     beforeEach(async () => {
-        ({ state } = await initializeState());
+        ({ state, seed } = await initializeState());
         tokenProgram = spl_token_1.TOKEN_PROGRAM_ID; // Some tests might override this.
         const initialRelayData = {
             depositor: recipient,
@@ -108,7 +109,7 @@ describe("svm_spoke.fill", () => {
         };
         updateRelayData(initialRelayData);
     });
-    it("Fills a V3 relay and verifies balances", async () => {
+    it("Fills a relay and verifies balances", async () => {
         // Verify recipient's balance before the fill
         let recipientAccount = await (0, spl_token_1.getAccount)(connection, recipientTA);
         assertSE(recipientAccount.amount, "0", "Recipient's balance should be 0 before the fill");
@@ -116,7 +117,7 @@ describe("svm_spoke.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, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([relayHash, relayData, chainId, relayer.publicKey]);
         // Verify relayer's balance after the fill
         relayerAccount = await (0, spl_token_1.getAccount)(connection, relayerTA);
         assertSE(relayerAccount.amount, seedBalance - relayAmount, "Relayer's balance should be reduced by the relay amount");
@@ -136,8 +137,9 @@ describe("svm_spoke.fill", () => {
             if (key === "message") {
                 assertSE(event.messageHash, (0, web3_v1_1.hashNonEmptyMessage)(value), `MessageHash should match`);
             }
-            else
+            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");
@@ -148,7 +150,7 @@ describe("svm_spoke.fill", () => {
         assertSE(event.repaymentChainId, new anchor_1.BN(420), "Repayment chain id should match");
         assertSE(event.relayer, otherRelayer.publicKey, "Repayment address should match");
     });
-    it("Fails to fill a V3 relay after the fill deadline", async () => {
+    it("Fails to fill a relay after the fill deadline", async () => {
         updateRelayData({ ...relayData, fillDeadline: Math.floor(Date.now() / 1000) - 69 }); // 69 seconds ago
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
@@ -159,7 +161,7 @@ describe("svm_spoke.fill", () => {
             assert.include(err.toString(), "ExpiredFillDeadline", "Expected ExpiredFillDeadline error");
         }
     });
-    it("Fails to fill a V3 relay by non-exclusive relayer before exclusivity deadline", async () => {
+    it("Fails to fill a relay by non-exclusive relayer before exclusivity deadline", async () => {
         accounts.signer = otherRelayer.publicKey;
         accounts.relayerTokenAccount = otherRelayerTA;
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
@@ -186,7 +188,7 @@ describe("svm_spoke.fill", () => {
         const recipientAccountAfter = await (0, spl_token_1.getAccount)(connection, recipientTA);
         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 () => {
+    it("Fails to fill a relay with the same deposit data multiple times", async () => {
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         // First fill attempt
         await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
@@ -207,7 +209,7 @@ describe("svm_spoke.fill", () => {
             fillStatus: accounts.fillStatus,
             systemProgram: anchor.web3.SystemProgram.programId,
         };
-        // Execute the fill_v3_relay call
+        // Execute the fill_relay call
         await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Verify the fill PDA exists before closing
         const fillStatusAccountBefore = await connection.getAccountInfo(accounts.fillStatus);
@@ -228,17 +230,17 @@ describe("svm_spoke.fill", () => {
         const fillStatusAccountAfter = await connection.getAccountInfo(accounts.fillStatus);
         assert.isNull(fillStatusAccountAfter, "Fill PDA should be closed after closing");
     });
-    it("Fetches FillStatusAccount before and after fillV3Relay", async () => {
+    it("Fetches FillStatusAccount before and after fillRelay", async () => {
         const relayHash = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
         const [fillStatusPDA] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHash], program.programId);
-        // Fetch FillStatusAccount before fillV3Relay
+        // Fetch FillStatusAccount before fillRelay
         let fillStatusAccount = await program.account.fillStatusAccount.fetchNullable(fillStatusPDA);
-        assert.isNull(fillStatusAccount, "FillStatusAccount should be uninitialized before fillV3Relay");
+        assert.isNull(fillStatusAccount, "FillStatusAccount should be uninitialized before fillRelay");
         // Fill the relay
         await approvedFillRelay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey]);
-        // Fetch FillStatusAccount after fillV3Relay
+        // Fetch FillStatusAccount after fillRelay
         fillStatusAccount = await program.account.fillStatusAccount.fetch(fillStatusPDA);
-        assert.isNotNull(fillStatusAccount, "FillStatusAccount should be initialized after fillV3Relay");
+        assert.isNotNull(fillStatusAccount, "FillStatusAccount should be initialized after fillRelay");
         assert.equal(JSON.stringify(fillStatusAccount.status), `{\"filled\":{}}`, "FillStatus should be Filled");
         assert.equal(fillStatusAccount.relayer.toString(), relayer.publicKey.toString(), "Caller should be set as relayer");
     });
@@ -297,7 +299,7 @@ describe("svm_spoke.fill", () => {
             assert.include(err.toString(), "InvalidMint", "Expected InvalidMint error");
         }
     });
-    it("Fills a V3 relay from custom relayer token account", async () => {
+    it("Fills a relay from custom relayer token account", async () => {
         // Create and mint to custom relayer token account
         const customKeypair = web3_js_1.Keypair.generate();
         const customRelayerTA = await (0, spl_token_1.createAccount)(connection, payer, mint, relayer.publicKey, customKeypair);
@@ -327,7 +329,8 @@ describe("svm_spoke.fill", () => {
         };
         updateRelayData(newRelayData);
         accounts.recipientTokenAccount = newRecipientATA;
-        const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId));
+        const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId);
+        const relayHash = Array.from(relayHashUint8Array);
         try {
             await approvedFillRelay([relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to missing ATA");
@@ -344,11 +347,12 @@ describe("svm_spoke.fill", () => {
             { pubkey: newRecipientATA, isWritable: true, isSigner: false },
         ])
             .instruction();
+        const { pda: delegatePda } = (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId);
         // Fill the deposit in the same transaction
-        const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, accounts.state, accounts.signer, BigInt(newRelayData.outputAmount.toString()), tokenDecimals, undefined, tokenProgram);
+        const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, delegatePda, accounts.signer, BigInt(newRelayData.outputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         const fillInstruction = await program.methods
             .fillRelay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
-            .accounts(accounts)
+            .accounts({ ...accounts, delegate: delegatePda })
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
         // Create and send the transaction
@@ -377,7 +381,7 @@ describe("svm_spoke.fill", () => {
             .instruction();
         // Build instructions for all fills
         let totalFillAmount = new anchor_1.BN(0);
-        const fillInstructions = [];
+        const approveAndfillInstructions = [];
         for (let i = 0; i < numberOfFills; i++) {
             const newRelayData = {
                 ...relayData,
@@ -387,17 +391,20 @@ describe("svm_spoke.fill", () => {
             totalFillAmount = totalFillAmount.add(newRelayData.outputAmount);
             updateRelayData(newRelayData);
             accounts.recipientTokenAccount = recipientAssociatedTokens[i];
-            const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId));
+            const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId);
+            const relayHash = Array.from(relayHashUint8Array);
+            const { pda: delegatePda } = (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId);
+            const approveInstruction = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, delegatePda, accounts.signer, BigInt(totalFillAmount.toString()), tokenDecimals, undefined, tokenProgram);
+            approveAndfillInstructions.push(approveInstruction);
             const fillInstruction = await program.methods
                 .fillRelay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
-                .accounts(accounts)
+                .accounts({ ...accounts, delegate: delegatePda })
                 .remainingAccounts(fillRemainingAccounts)
                 .instruction();
-            fillInstructions.push(fillInstruction);
+            approveAndfillInstructions.push(fillInstruction);
         }
-        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, web3_v1_1.sendTransactionWithLookupTable)(connection, [createTokenAccountsInstruction, approveInstruction, ...fillInstructions], relayer);
+        await (0, web3_v1_1.sendTransactionWithLookupTable)(connection, [createTokenAccountsInstruction, ...approveAndfillInstructions], 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;
@@ -460,9 +467,12 @@ describe("svm_spoke.fill", () => {
             assertSE(recipientAccount.amount, "0", "Recipient's balance should be 0 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, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
+            const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
+            const relayHash = Array.from(relayHashUint8Array);
+            const delegate = (0, kit_1.address)((0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda.toString());
             const formattedAccounts = {
                 state: (0, kit_1.address)(accounts.state.toString()),
+                delegate,
                 instructionParams: (0, kit_1.address)(program.programId.toString()),
                 mint: (0, kit_1.address)(mint.toString()),
                 relayerTokenAccount: (0, kit_1.address)(relayerTA.toString()),
@@ -497,7 +507,7 @@ describe("svm_spoke.fill", () => {
             const approveIx = (0, token_1.getApproveCheckedInstruction)({
                 source: (0, kit_1.address)(accounts.relayerTokenAccount.toString()),
                 mint: (0, kit_1.address)(accounts.mint.toString()),
-                delegate: (0, kit_1.address)(accounts.state.toString()),
+                delegate,
                 owner: (0, kit_1.address)(accounts.signer.toString()),
                 amount: BigInt(relayData.outputAmount.toString()),
                 decimals: tokenDecimals,
@@ -536,9 +546,12 @@ describe("svm_spoke.fill", () => {
             assertSE(recipientAccount.amount, "0", "Recipient's balance should be 0 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, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
+            const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
+            const relayHash = Array.from(relayHashUint8Array);
+            const delegate = (0, kit_1.address)((0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda.toString());
             const formattedAccounts = {
                 state: (0, kit_1.address)(accounts.state.toString()),
+                delegate,
                 instructionParams: (0, kit_1.address)(program.programId.toString()),
                 mint: (0, kit_1.address)(mint.toString()),
                 relayerTokenAccount: (0, kit_1.address)(relayerTA.toString()),
@@ -573,7 +586,7 @@ describe("svm_spoke.fill", () => {
             const approveIx = (0, token_1.getApproveCheckedInstruction)({
                 source: (0, kit_1.address)(accounts.relayerTokenAccount.toString()),
                 mint: (0, kit_1.address)(accounts.mint.toString()),
-                delegate: (0, kit_1.address)(accounts.state.toString()),
+                delegate,
                 owner: (0, kit_1.address)(accounts.signer.toString()),
                 amount: BigInt(relayData.outputAmount.toString()),
                 decimals: tokenDecimals,
@@ -595,6 +608,7 @@ describe("svm_spoke.fill", () => {
             const alt = await (0, svm_1.createLookupTable)(rpcClient, signer);
             const ac = [
                 formattedAccounts.state,
+                formattedAccounts.delegate,
                 formattedAccounts.instructionParams,
                 formattedAccounts.mint,
                 formattedAccounts.relayerTokenAccount,

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

@@ -25,14 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 chai_1 = require("chai");
 const crypto = __importStar(require("crypto"));
 const ethers_1 = require("ethers");
 const web3_v1_1 = require("../../src/svm/web3-v1");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
-const { createRoutePda, getVaultAta, initializeState, crossDomainAdmin, remoteDomain, localDomain } = SvmSpoke_common_1.common;
+const { initializeState, crossDomainAdmin, remoteDomain, localDomain } = SvmSpoke_common_1.common;
 describe("svm_spoke.handle_receive_message", () => {
     anchor.setProvider(anchor_1.AnchorProvider.env());
     const program = anchor_1.workspace.SvmSpoke;
@@ -56,7 +55,6 @@ describe("svm_spoke.handle_receive_message", () => {
         "function pauseDeposits(bool pause)",
         "function pauseFills(bool pause)",
         "function setCrossDomainAdmin(address newCrossDomainAdmin)",
-        "function setEnableRoute(bytes32 originToken, uint64 destinationChainId, bool enabled)",
         "function relayRootBundle(bytes32 relayerRefundRoot, bytes32 slowRelayRoot)",
         "function emergencyDeleteRootBundle(uint256 rootBundleId)",
     ]);
@@ -297,116 +295,6 @@ describe("svm_spoke.handle_receive_message", () => {
         let stateData = await program.account.state.fetch(state);
         chai_1.assert.strictEqual(stateData.crossDomainAdmin.toString(), newCrossDomainAdminPubkey.toString(), "Cross-domain admin should be set");
     });
-    it("Enables and disables route remotely", async () => {
-        // Enable the route.
-        const originToken = await (0, spl_token_1.createMint)(provider.connection, provider.wallet.payer, owner, owner, 6);
-        const routeChainId = 1;
-        let calldata = ethereumIface.encodeFunctionData("setEnableRoute", [originToken.toBuffer(), routeChainId, true]);
-        let messageBody = Buffer.from(calldata.slice(2), "hex");
-        let message = (0, web3_v1_1.encodeMessageHeader)({
-            version: cctpMessageversion,
-            sourceDomain: remoteDomain.toNumber(),
-            destinationDomain: localDomain,
-            nonce: BigInt(nonce),
-            sender: crossDomainAdmin,
-            recipient: program.programId,
-            destinationCaller,
-            messageBody,
-        });
-        // Remaining accounts specific to SetEnableRoute.
-        const routePda = createRoutePda(originToken, seed, new anchor_1.BN(routeChainId));
-        const vault = await getVaultAta(originToken, state);
-        // Same 3 remaining accounts passed for HandleReceiveMessage context.
-        const enableRouteRemainingAccounts = remainingAccounts.slice(0, 3);
-        // payer in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: true,
-            isWritable: true,
-            pubkey: provider.wallet.publicKey,
-        });
-        // state in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: state,
-        });
-        // route in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: true,
-            pubkey: routePda,
-        });
-        // vault in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: true,
-            pubkey: vault,
-        });
-        // origin_token_mint in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: originToken,
-        });
-        // token_program in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: spl_token_1.TOKEN_PROGRAM_ID,
-        });
-        // associated_token_program in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-        });
-        // system_program in self-invoked SetEnableRoute.
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: anchor_1.web3.SystemProgram.programId,
-        });
-        // event_authority in self-invoked SetEnableRoute (appended by Anchor with event_cpi macro).
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: eventAuthority,
-        });
-        // program in self-invoked SetEnableRoute (appended by Anchor with event_cpi macro).
-        enableRouteRemainingAccounts.push({
-            isSigner: false,
-            isWritable: false,
-            pubkey: program.programId,
-        });
-        await messageTransmitterProgram.methods
-            .receiveMessage({ message, attestation })
-            .accounts(receiveMessageAccounts)
-            .remainingAccounts(enableRouteRemainingAccounts)
-            .rpc();
-        let routeAccount = await program.account.route.fetch(routePda);
-        chai_1.assert.isTrue(routeAccount.enabled, "Route should be enabled");
-        // Disable the route.
-        nonce += 1;
-        calldata = ethereumIface.encodeFunctionData("setEnableRoute", [originToken.toBuffer(), routeChainId, false]);
-        messageBody = Buffer.from(calldata.slice(2), "hex");
-        message = (0, web3_v1_1.encodeMessageHeader)({
-            version: cctpMessageversion,
-            sourceDomain: remoteDomain.toNumber(),
-            destinationDomain: localDomain,
-            nonce: BigInt(nonce),
-            sender: crossDomainAdmin,
-            recipient: program.programId,
-            destinationCaller,
-            messageBody,
-        });
-        await messageTransmitterProgram.methods
-            .receiveMessage({ message, attestation })
-            .accounts(receiveMessageAccounts)
-            .remainingAccounts(enableRouteRemainingAccounts)
-            .rpc();
-        routeAccount = await program.account.route.fetch(routePda);
-        chai_1.assert.isFalse(routeAccount.enabled, "Route should be disabled");
-    });
     it("Relays root bundle remotely", async () => {
         // Encode relayRootBundle message.
         const relayerRefundRoot = crypto.randomBytes(32);
@@ -431,7 +319,7 @@ describe("svm_spoke.handle_receive_message", () => {
         const [rootBundle] = anchor_1.web3.PublicKey.findProgramAddressSync(seeds, program.programId);
         // Same 3 remaining accounts passed for HandleReceiveMessage context.
         const relayRootBundleRemainingAccounts = remainingAccounts.slice(0, 3);
-        // payer in self-invoked SetEnableRoute.
+        // payer in self-invoked RelayRootBundle.
         relayRootBundleRemainingAccounts.push({
             isSigner: true,
             isWritable: true,

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

@@ -104,11 +104,11 @@ describe("svm_spoke.slow_fill.across_plus", () => {
             loadRequestParamsInstructions = await (0, web3_v1_1.loadRequestSlowFillParams)(program, relayer, requestSlowFillValues[1]);
             [requestAccounts.instructionParams] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("instruction_params"), relayer.publicKey.toBuffer()], program.programId);
         }
-        const requestV3SlowFillParams = bufferParams
+        const requestSlowFillParams = bufferParams
             ? [requestSlowFillValues[0], null]
             : requestSlowFillValues;
         const requestIx = await program.methods
-            .requestSlowFill(...requestV3SlowFillParams)
+            .requestSlowFill(...requestSlowFillParams)
             .accounts(requestAccounts)
             .instruction();
         const executeAccounts = {