@across-protocol/contracts 4.0.1 → 4.0.3

package/dist/tasks/enableL1TokenAcrossEcosystem.js

@@ -11,12 +11,13 @@ const { ARBITRUM, OPTIMISM } = constants_1.CHAIN_IDs;
 const NO_SYMBOL = "----";
 const NO_ADDRESS = "------------------------------------------";
 // Supported mainnet chain IDs.
-const enabledChainIds = Object.values(constants_1.MAINNET_CHAIN_IDs)
-    .map(Number)
-    .filter((chainId) => chainId !== constants_1.CHAIN_IDs.BOBA)
-    .sort((x, y) => x - y);
-const chainPadding = enabledChainIds[enabledChainIds.length - 1].toString().length;
-const formatChainId = (chainId) => chainId.toString().padStart(chainPadding, " ");
+const enabledChainIds = (hubChainId) => {
+    const chainIds = hubChainId === constants_1.CHAIN_IDs.MAINNET ? constants_1.MAINNET_CHAIN_IDs : constants_1.TESTNET_CHAIN_IDs;
+    return Object.values(chainIds)
+        .map(Number)
+        .filter((chainId) => chainId !== constants_1.CHAIN_IDs.BOBA)
+        .sort((x, y) => x - y);
+};
 const getChainsFromList = (taskArgInput) => taskArgInput
     ?.replace(/\s/g, "")
     ?.split(",")
@@ -52,20 +53,21 @@ const getChainsFromList = (taskArgInput) => taskArgInput
     const { deployments, ethers } = hre;
     const [signer] = await hre.ethers.getSigners();
     // Remove chainIds that are in the ignore list.
+    const _enabledChainIds = enabledChainIds(hubChainId);
     let inputChains = [];
     try {
-        inputChains = (chains?.split(",") ?? enabledChainIds).map(Number);
+        inputChains = (chains?.split(",") ?? _enabledChainIds).map(Number);
         console.log(`\nParsed 'chains' argument:`, inputChains);
     }
     catch (error) {
         throw new Error(`Failed to parse 'chains' argument ${chains} as a comma-separated list of numbers.`);
     }
     if (inputChains.length === 0)
-        inputChains = enabledChainIds;
+        inputChains = _enabledChainIds;
     else if (inputChains.some((chain) => isNaN(chain) || !Number.isInteger(chain) || chain < 0)) {
         throw new Error(`Invalid chains list: ${inputChains}`);
     }
-    const chainIds = enabledChainIds.filter((chainId) => inputChains.includes(chainId));
+    const chainIds = _enabledChainIds.filter((chainId) => inputChains.includes(chainId));
     console.log("\nLoading L2 companion token address for provided L1 token.");
     const tokens = Object.fromEntries(chainIds.map((chainId) => {
         const token = (0, utils_1.resolveTokenOnChain)(matchedSymbol, chainId);
@@ -97,9 +99,11 @@ const getChainsFromList = (taskArgInput) => taskArgInput
     let i = 0; // counter for logging.
     const skipped = {};
     const routeChainIds = Object.keys(tokens).map(Number);
+    const chainPadding = _enabledChainIds[enabledChainIds.length - 1].toString().length;
+    const formatChainId = (chainId) => chainId.toString().padStart(chainPadding, " ");
     routeChainIds.forEach((fromId) => {
         const formattedFromId = formatChainId(fromId);
-        const { symbol, address: inputToken } = tokens[fromId];
+        const { address: inputToken } = tokens[fromId];
         skipped[fromId] = [];
         routeChainIds.forEach((toId) => {
             if (fromId === toId || [fromId, toId].some((chainId) => tokens[chainId].symbol === NO_SYMBOL)) {

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

@@ -78,11 +78,11 @@ describe("svm_spoke.deposit", () => {
             program: program.programId,
         };
     };
-    const approvedDepositV3 = async (depositDataValues, calledDepositAccounts = depositAccounts) => {
+    const approvedDeposit = async (depositDataValues, calledDepositAccounts = depositAccounts) => {
         // Delegate state PDA to pull depositor tokens.
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(calledDepositAccounts.depositorTokenAccount, calledDepositAccounts.mint, calledDepositAccounts.state, depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         const depositIx = await program.methods
-            .depositV3(...depositDataValues)
+            .deposit(...depositDataValues)
             .accounts(calledDepositAccounts)
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
@@ -95,13 +95,13 @@ describe("svm_spoke.deposit", () => {
         await setupInputToken();
         await enableRoute();
     });
-    it("Deposits tokens via deposit_v3 function and checks balances", async () => {
+    it("Deposits tokens via deposit function and checks balances", async () => {
         // Verify vault balance is zero before the deposit
         let vaultAccount = await (0, spl_token_1.getAccount)(connection, vault);
         assertSE(vaultAccount.amount, "0", "Vault balance should be zero before the deposit");
-        // Execute the deposit_v3 call
+        // Execute the deposit call
         let depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
+        await approvedDeposit(depositDataValues);
         // Verify tokens leave the depositor's account
         let depositorAccount = await (0, spl_token_1.getAccount)(connection, depositorTA);
         assertSE(depositorAccount.amount, seedBalance - depositData.inputAmount.toNumber(), "Depositor's balance should be reduced by the deposited amount");
@@ -110,9 +110,9 @@ describe("svm_spoke.deposit", () => {
         assertSE(vaultAccount.amount, depositData.inputAmount, "Vault balance should be increased by the deposited amount");
         // Modify depositData for the second deposit
         const secondInputAmount = new anchor_1.BN(300000);
-        // Execute the second deposit_v3 call
+        // Execute the second deposit call
         depositDataValues = Object.values({ ...depositData, inputAmount: secondInputAmount });
-        await approvedDepositV3(depositDataValues);
+        await approvedDeposit(depositDataValues);
         // Verify tokens leave the depositor's account again
         depositorAccount = await (0, spl_token_1.getAccount)(connection, depositorTA);
         assertSE(depositorAccount.amount, seedBalance - depositData.inputAmount.toNumber() - secondInputAmount.toNumber(), "Depositor's balance should be reduced by the total deposited amount");
@@ -120,11 +120,11 @@ describe("svm_spoke.deposit", () => {
         vaultAccount = await (0, spl_token_1.getAccount)(connection, vault);
         assertSE(vaultAccount.amount, depositData.inputAmount.add(secondInputAmount), "Vault balance should be increased by the total deposited amount");
     });
-    it("Verifies V3FundsDeposited after deposits", async () => {
+    it("Verifies FundsDeposited after deposits", async () => {
         depositData.inputAmount = depositData.inputAmount.add(new anchor_1.BN(69));
-        // Execute the first deposit_v3 call
+        // Execute the first deposit call
         let depositDataValues = Object.values(depositData);
-        const tx = await approvedDepositV3(depositDataValues);
+        const tx = await approvedDeposit(depositDataValues);
         let events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event
         const expectedValues1 = { ...depositData, depositId: (0, web3_v1_1.intToU8Array32)(1) }; // Verify the event props emitted match the depositData.
@@ -137,7 +137,7 @@ describe("svm_spoke.deposit", () => {
         assertSE((0, web3_v1_1.u8Array32ToInt)(event.depositId), 1, `depositId should recover to 1`);
         assertSE((0, web3_v1_1.u8Array32ToBigNumber)(event.depositId), ethers_1.BigNumber.from(1), `depositId should recover to 1`);
         // Execute the second deposit_v3 call
-        const tx2 = await approvedDepositV3(depositDataValues);
+        const tx2 = await approvedDeposit(depositDataValues);
         events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx2, [program]);
         event = events[0].data; // 0th event is the latest event.
         const expectedValues2 = { ...expectedValues1, depositId: (0, web3_v1_1.intToU8Array32)(2) }; // Verify the event props emitted match the depositData.
@@ -150,6 +150,18 @@ describe("svm_spoke.deposit", () => {
         assertSE((0, web3_v1_1.u8Array32ToInt)(event.depositId), 2, `depositId should recover to 2`);
         assertSE((0, web3_v1_1.u8Array32ToBigNumber)(event.depositId), ethers_1.BigNumber.from(2), `depositId should recover to 2`);
     });
+    it("Deposit with deadline before current time succeeds", async () => {
+        const currentTime = await getCurrentTime(program, state);
+        // Fill deadline is before current time on the contract
+        let fillDeadline = currentTime - 1; // 1 second before current time on the contract.
+        depositData.fillDeadline = new anchor_1.BN(fillDeadline);
+        depositData.quoteTimestamp = new anchor_1.BN(currentTime - 1); // 1 second before current time on the contract to reset.
+        const depositDataValues = Object.values(depositData);
+        const tx = await approvedDeposit(depositDataValues);
+        const events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx, [program]);
+        const event = events[0].data; // 0th event is the latest event.
+        assertSE(event.fillDeadline, fillDeadline, "Fill deadline should match");
+    });
     it("Fails to deposit tokens to a route that is uninitalized", async () => {
         const differentChainId = new anchor_1.BN(2); // Different chain ID
         if (!depositData.inputToken) {
@@ -162,7 +174,7 @@ describe("svm_spoke.deposit", () => {
                 ...depositData,
                 destinationChainId: differentChainId,
             });
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Deposit should have failed for a route that is not initialized");
         }
         catch (err) {
@@ -177,7 +189,7 @@ describe("svm_spoke.deposit", () => {
             .rpc();
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Deposit should have failed for a route that is explicitly disabled");
         }
         catch (err) {
@@ -193,7 +205,7 @@ describe("svm_spoke.deposit", () => {
         // Try to deposit. This should fail because deposits are paused.
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Should not be able to process deposit when deposits are paused");
         }
         catch (err) {
@@ -206,7 +218,7 @@ describe("svm_spoke.deposit", () => {
         depositData.quoteTimestamp = futureQuoteTimestamp;
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Deposit should have failed due to InvalidQuoteTimestamp");
         }
         catch (err) {
@@ -219,7 +231,7 @@ describe("svm_spoke.deposit", () => {
         depositData.quoteTimestamp = futureQuoteTimestamp;
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Deposit should have failed due to InvalidQuoteTimestamp");
         }
         catch (err) {
@@ -228,24 +240,13 @@ describe("svm_spoke.deposit", () => {
     });
     it("Fails to deposit tokens with InvalidFillDeadline when fill deadline is invalid", async () => {
         const currentTime = await getCurrentTime(program, state);
-        // Case 1: Fill deadline is older than the current time on the contract
-        let invalidFillDeadline = currentTime - 1; // 1 second before current time on the contract.
-        depositData.fillDeadline = new anchor_1.BN(invalidFillDeadline);
-        depositData.quoteTimestamp = new anchor_1.BN(currentTime - 1); // 1 second before current time on the contract to reset.
-        try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
-            assert.fail("Deposit should have failed due to InvalidFillDeadline (past deadline)");
-        }
-        catch (err) {
-            assert.include(err.toString(), "InvalidFillDeadline", "Expected InvalidFillDeadline error for past deadline");
-        }
-        // Case 2: Fill deadline is too far ahead (longer than fill_deadline_buffer + currentTime)
-        invalidFillDeadline = currentTime + fillDeadlineBuffer.toNumber() + 1; // 1 seconds beyond the buffer
+        // Fill deadline is too far ahead (longer than fill_deadline_buffer + currentTime)
+        const invalidFillDeadline = currentTime + fillDeadlineBuffer.toNumber() + 1; // 1 seconds beyond the buffer
         depositData.fillDeadline = new anchor_1.BN(invalidFillDeadline);
+        depositData.quoteTimestamp = new anchor_1.BN(currentTime);
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Deposit should have failed due to InvalidFillDeadline (future deadline)");
         }
         catch (err) {
@@ -259,13 +260,13 @@ describe("svm_spoke.deposit", () => {
         // Create a new input token and enable the route (this updates global scope variables).
         await setupInputToken();
         await enableRoute();
-        // Try to execute the deposit_v3 call with malformed inputs where the first input token and its derived route is
+        // Try to execute the deposit call with malformed inputs where the first input token and its derived route is
         // passed combined with mint, vault and user token account from the second input token.
         const malformedDepositData = { ...depositData, inputToken: firstInputToken };
         const malformedDepositAccounts = { ...depositAccounts, route: firstDepositAccounts.route };
         try {
             const depositDataValues = Object.values(malformedDepositData);
-            await approvedDepositV3(depositDataValues, malformedDepositAccounts);
+            await approvedDeposit(depositDataValues, malformedDepositAccounts);
             assert.fail("Should not be able to process deposit for inconsistent mint");
         }
         catch (err) {
@@ -307,7 +308,7 @@ describe("svm_spoke.deposit", () => {
             ...depositData,
             destinationChainId: fakeRouteChainId,
         });
-        const tx = await approvedDepositV3(depositDataValues, fakeDepositAccounts);
+        const tx = await approvedDeposit(depositDataValues, fakeDepositAccounts);
         let events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx, [program]);
         let event = events[0].data; // 0th event is the latest event.
         const expectedValues = {
@@ -327,7 +328,7 @@ describe("svm_spoke.deposit", () => {
             const depositDataValues = Object.values({
                 ...{ ...depositData, destinationChainId: fakeRouteChainId },
             });
-            await approvedDepositV3(depositDataValues, { ...depositAccounts, route: fakeRoutePda });
+            await approvedDeposit(depositDataValues, { ...depositAccounts, route: fakeRoutePda });
             assert.fail("Deposit should have failed for a fake route PDA");
         }
         catch (err) {
@@ -344,9 +345,9 @@ describe("svm_spoke.deposit", () => {
         const fillDeadlineOffset = 60; // 60 seconds offset
         // Delegate state PDA to pull depositor tokens.
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, depositAccounts.state, depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
-        // Execute the deposit_v3_now call. Remove the quoteTimestamp from the depositData as not needed for this method.
+        // Execute the deposit_now call. Remove the quoteTimestamp from the depositData as not needed for this method.
         const depositIx = await program.methods
-            .depositV3Now(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, fillDeadlineOffset, 0, depositData.message)
+            .depositNow(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, fillDeadlineOffset, 0, depositData.message)
             .accounts(depositAccounts)
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
@@ -375,7 +376,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusivityParameter = new anchor_1.BN(1);
         try {
             const depositDataValues = Object.values(depositData);
-            await approvedDepositV3(depositDataValues);
+            await approvedDeposit(depositDataValues);
             assert.fail("Should have failed due to InvalidExclusiveRelayer");
         }
         catch (err) {
@@ -392,7 +393,7 @@ describe("svm_spoke.deposit", () => {
             depositData.exclusivityParameter = exclusivityDeadline;
             try {
                 const depositDataValues = Object.values(depositData);
-                await approvedDepositV3(depositDataValues);
+                await approvedDeposit(depositDataValues);
                 assert.fail("Should have failed due to InvalidExclusiveRelayer");
             }
             catch (err) {
@@ -402,7 +403,7 @@ describe("svm_spoke.deposit", () => {
         // Test with exclusivityDeadline set to 0
         depositData.exclusivityParameter = new anchor_1.BN(0);
         const depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
+        await approvedDeposit(depositDataValues);
     });
     it("Exclusivity param is used as an offset", async () => {
         const currentTime = new anchor_1.BN(await getCurrentTime(program, state));
@@ -410,7 +411,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = maxExclusivityOffsetSeconds;
         const depositDataValues = Object.values(depositData);
-        const tx = await approvedDepositV3(depositDataValues);
+        const tx = await approvedDeposit(depositDataValues);
         const events = await (0, web3_v1_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");
@@ -422,7 +423,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = exclusivityDeadlineTimestamp;
         const depositDataValues = Object.values(depositData);
-        const tx = await approvedDepositV3(depositDataValues);
+        const tx = await approvedDeposit(depositDataValues);
         const events = await (0, web3_v1_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");
@@ -434,7 +435,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = zeroExclusivity;
         const depositDataValues = Object.values(depositData);
-        const tx = await approvedDepositV3(depositDataValues);
+        const tx = await approvedDeposit(depositDataValues);
         const events = await (0, web3_v1_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");
@@ -457,7 +458,7 @@ describe("svm_spoke.deposit", () => {
         const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, depositAccounts.state, depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         // Create the transaction for unsafeDepositV3
         const unsafeDepositIx = await program.methods
-            .unsafeDepositV3(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, forcedDepositId, // deposit nonce
+            .unsafeDeposit(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, forcedDepositId, // deposit nonce
         depositData.quoteTimestamp.toNumber(), depositData.fillDeadline.toNumber(), depositData.exclusivityParameter.toNumber(), depositData.message)
             .accounts(depositAccounts) // Assuming depositAccounts is already set up correctly
             .instruction();
@@ -485,9 +486,9 @@ describe("svm_spoke.deposit", () => {
         // Verify vault balance is zero before the deposit
         let vaultAccount = await (0, spl_token_1.getAccount)(connection, vault, undefined, tokenProgram);
         assertSE(vaultAccount.amount, "0", "Vault balance should be zero before the deposit");
-        // Execute the deposit_v3 call
+        // Execute the deposit call
         const depositDataValues = Object.values(depositData);
-        await approvedDepositV3(depositDataValues);
+        await approvedDeposit(depositDataValues);
         // Verify tokens leave the depositor's account
         const depositorAccount = await (0, spl_token_1.getAccount)(connection, depositorTA, undefined, tokenProgram);
         assertSE(depositorAccount.amount, seedBalance - depositData.inputAmount.toNumber(), "Depositor's balance should be reduced by the deposited amount");
@@ -499,7 +500,7 @@ describe("svm_spoke.deposit", () => {
         const depositDataValues = Object.values(depositData);
         try {
             await program.methods
-                .depositV3(...depositDataValues)
+                .deposit(...depositDataValues)
                 .accounts(depositAccounts)
                 .signers([depositor])
                 .rpc();

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

@@ -69,14 +69,14 @@ describe("svm_spoke.fill.across_plus", () => {
         // Prepare fill instruction.
         const fillV3RelayValues = [relayHash, relayData, new anchor_1.BN(1), relayer.publicKey];
         if (bufferParams) {
-            await (0, web3_v1_1.loadFillV3RelayParams)(program, relayer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+            await (0, web3_v1_1.loadFillRelayParams)(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
             ? [fillV3RelayValues[0], null, null, null]
             : fillV3RelayValues;
         const fillIx = await program.methods
-            .fillV3Relay(...fillV3RelayParams)
+            .fillRelay(...fillV3RelayParams)
             .accounts(accounts)
             .remainingAccounts(remainingAccounts)
             .instruction();

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

@@ -61,11 +61,11 @@ describe("svm_spoke.fill", () => {
             program: program.programId,
         };
     }
-    const approvedFillV3Relay = async (fillDataValues, calledFillAccounts = accounts, callingRelayer = relayer) => {
+    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 fillIx = await program.methods
-            .fillV3Relay(...fillDataValues)
+            .fillRelay(...fillDataValues)
             .accounts(calledFillAccounts)
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
@@ -114,7 +114,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 approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([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);
         assertSE(relayerAccount.amount, seedBalance - relayAmount, "Relayer's balance should be reduced by the relay amount");
@@ -122,13 +122,13 @@ describe("svm_spoke.fill", () => {
         recipientAccount = await (0, spl_token_1.getAccount)(connection, recipientTA);
         assertSE(recipientAccount.amount, relayAmount, "Recipient's balance should be increased by the relay amount");
     });
-    it("Verifies FilledV3Relay event after filling a relay", async () => {
+    it("Verifies FilledRelay event after filling a relay", async () => {
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        const tx = await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
-        // Fetch and verify the FilledV3Relay event
+        const tx = await approvedFillRelay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
+        // Fetch and verify the FilledRelay event
         const events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx, [program]);
-        const event = events.find((event) => event.name === "filledV3Relay")?.data;
-        assert.isNotNull(event, "FilledV3Relay event should be emitted");
+        const event = events.find((event) => event.name === "filledRelay")?.data;
+        assert.isNotNull(event, "FilledRelay event should be emitted");
         // Verify that the event data matches the relay data.
         Object.entries(relayData).forEach(([key, value]) => {
             if (key === "message") {
@@ -150,7 +150,7 @@ describe("svm_spoke.fill", () => {
         updateRelayData({ ...relayData, fillDeadline: Math.floor(Date.now() / 1000) - 69 }); // 69 seconds ago
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
-            await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+            await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to fill deadline passed");
         }
         catch (err) {
@@ -162,7 +162,7 @@ describe("svm_spoke.fill", () => {
         accounts.relayerTokenAccount = otherRelayerTA;
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
-            await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey], undefined, otherRelayer);
+            await approvedFillRelay([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");
         }
         catch (err) {
@@ -176,7 +176,7 @@ describe("svm_spoke.fill", () => {
         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, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey], undefined, otherRelayer);
+        await approvedFillRelay([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);
         assertSE(relayerAccountAfter.amount, BigInt(relayerAccountBefore.amount) - BigInt(relayAmount), "Relayer's balance should be reduced by the relay amount");
@@ -187,10 +187,10 @@ describe("svm_spoke.fill", () => {
     it("Fails to fill a V3 relay with the same deposit data multiple times", async () => {
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         // First fill attempt
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Second fill attempt with the same data
         try {
-            await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+            await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to RelayFilled error");
         }
         catch (err) {
@@ -206,7 +206,7 @@ describe("svm_spoke.fill", () => {
             systemProgram: anchor.web3.SystemProgram.programId,
         };
         // Execute the fill_v3_relay call
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        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);
         assert.isNotNull(fillStatusAccountBefore, "Fill PDA should exist before closing");
@@ -233,7 +233,7 @@ describe("svm_spoke.fill", () => {
         let fillStatusAccount = await program.account.fillStatusAccount.fetchNullable(fillStatusPDA);
         assert.isNull(fillStatusAccount, "FillStatusAccount should be uninitialized before fillV3Relay");
         // Fill the relay
-        await approvedFillV3Relay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey]);
         // Fetch FillStatusAccount after fillV3Relay
         fillStatusAccount = await program.account.fillStatusAccount.fetch(fillStatusPDA);
         assert.isNotNull(fillStatusAccount, "FillStatusAccount should be initialized after fillV3Relay");
@@ -249,7 +249,7 @@ describe("svm_spoke.fill", () => {
         // Try to fill the relay. This should fail because fills are paused.
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         try {
-            await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+            await approvedFillRelay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Should not be able to fill relay when fills are paused");
         }
         catch (err) {
@@ -263,7 +263,7 @@ describe("svm_spoke.fill", () => {
         const wrongRecipientTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, wrongRecipient)).address;
         const [wrongFillStatus] = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHash], program.programId);
         try {
-            await approvedFillV3Relay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey], {
+            await approvedFillRelay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey], {
                 ...accounts,
                 recipientTokenAccount: wrongRecipientTA,
                 fillStatus: wrongFillStatus,
@@ -283,7 +283,7 @@ describe("svm_spoke.fill", () => {
             .address;
         await (0, spl_token_1.mintTo)(connection, payer, wrongMint, wrongRelayerTA, owner, seedBalance);
         try {
-            await approvedFillV3Relay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey], {
+            await approvedFillRelay([Array.from(relayHash), relayData, new anchor_1.BN(1), relayer.publicKey], {
                 ...accounts,
                 mint: wrongMint,
                 relayerTokenAccount: wrongRelayerTA,
@@ -295,34 +295,6 @@ describe("svm_spoke.fill", () => {
             assert.include(err.toString(), "InvalidMint", "Expected InvalidMint error");
         }
     });
-    it("Self-relay does not invoke token transfer", async () => {
-        // Set recipient to be the same as relayer.
-        updateRelayData({ ...relayData, depositor: relayer.publicKey, recipient: relayer.publicKey });
-        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, web3_v1_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)
-            .accounts(accounts)
-            .remainingAccounts(fillRemainingAccounts)
-            .signers([relayer])
-            .rpc();
-        // Verify relayer's balance after the fill is unchanged
-        const fRelayerBalance = (await (0, spl_token_1.getAccount)(connection, relayerTA)).amount;
-        assertSE(fRelayerBalance, iRelayerBalance, "Relayer's balance should not have changed");
-        await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait for tx processing
-        const txResult = await connection.getTransaction(txSignature, {
-            commitment: "confirmed",
-            maxSupportedTransactionVersion: 0,
-        });
-        if (txResult === null || txResult.meta === null)
-            throw new Error("Transaction meta not confirmed");
-        if (txResult.meta.logMessages === null || txResult.meta.logMessages === undefined)
-            throw new Error("Transaction logs not found");
-        assert.isTrue(txResult.meta.logMessages.every((log) => !log.includes(`Program ${spl_token_1.TOKEN_PROGRAM_ID} invoke`)), "Token Program should not be invoked");
-    });
     it("Fills a V3 relay from custom relayer token account", async () => {
         // Create and mint to custom relayer token account
         const customKeypair = web3_js_1.Keypair.generate();
@@ -334,7 +306,7 @@ describe("svm_spoke.fill", () => {
         // Fill relay from custom relayer token account
         accounts.relayerTokenAccount = customRelayerTA;
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([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;
         const fRecipientBal = (await (0, spl_token_1.getAccount)(connection, recipientTA)).amount;
@@ -355,7 +327,7 @@ describe("svm_spoke.fill", () => {
         accounts.recipientTokenAccount = newRecipientATA;
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId));
         try {
-            await approvedFillV3Relay([relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey]);
+            await approvedFillRelay([relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey]);
             assert.fail("Fill should have failed due to missing ATA");
         }
         catch (err) {
@@ -373,7 +345,7 @@ describe("svm_spoke.fill", () => {
         // 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 fillInstruction = await program.methods
-            .fillV3Relay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
+            .fillRelay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
             .accounts(accounts)
             .remainingAccounts(fillRemainingAccounts)
             .instruction();
@@ -415,7 +387,7 @@ describe("svm_spoke.fill", () => {
             accounts.recipientTokenAccount = recipientAssociatedTokens[i];
             const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(newRelayData, chainId));
             const fillInstruction = await program.methods
-                .fillV3Relay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
+                .fillRelay(relayHash, newRelayData, new anchor_1.BN(1), relayer.publicKey)
                 .accounts(accounts)
                 .remainingAccounts(fillRemainingAccounts)
                 .instruction();
@@ -433,7 +405,7 @@ describe("svm_spoke.fill", () => {
             assertSE(recipientBal, BigInt(relayAmount), "Recipient's balance should be increased by the relay amount");
         });
     });
-    it("Fills a V3 relay with enabled CPI-guard", async () => {
+    it("Fills a relay with enabled CPI-guard", async () => {
         // CPI-guard is available only for the 2022 token program.
         tokenProgram = spl_token_1.TOKEN_2022_PROGRAM_ID;
         // Remint the tokens on the token 2022 program.
@@ -454,7 +426,7 @@ describe("svm_spoke.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, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(1), relayer.publicKey]);
+        await approvedFillRelay([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);
         assertSE(relayerAccount.amount, seedBalance - relayAmount, "Relayer's balance should be reduced by the relay amount");
@@ -465,11 +437,11 @@ describe("svm_spoke.fill", () => {
     it("Emits zeroed hash for empty message", async () => {
         updateRelayData({ ...relayData, message: Buffer.alloc(0) });
         const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
-        const tx = await approvedFillV3Relay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
-        // Fetch and verify the FilledV3Relay event
+        const tx = await approvedFillRelay([relayHash, relayData, new anchor_1.BN(420), otherRelayer.publicKey]);
+        // Fetch and verify the FilledRelay event
         const events = await (0, web3_v1_1.readEventsUntilFound)(connection, tx, [program]);
-        const event = events.find((event) => event.name === "filledV3Relay")?.data;
-        assert.isNotNull(event, "FilledV3Relay event should be emitted");
+        const event = events.find((event) => event.name === "filledRelay")?.data;
+        assert.isNotNull(event, "FilledRelay event should be emitted");
         // Verify that the event data has zeroed message hash.
         assertSE(event.messageHash, new Uint8Array(32), `MessageHash should be zeroed`);
         assertSE(event.relayExecutionInfo.updatedMessageHash, new Uint8Array(32), `UpdatedMessageHash should be zeroed`);