@across-protocol/contracts 4.0.11 → 4.0.12

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

@@ -35,44 +35,29 @@ const web3_v1_1 = require("../../src/svm/web3-v1");
 const test_utils_1 = require("../../test-utils");
 const SvmSpoke_common_1 = require("./SvmSpoke.common");
 const utils_1 = require("./utils");
-const { provider, connection, program, owner, seedBalance, initializeState, depositData, createRoutePda, getVaultAta, assertSE, assert, getCurrentTime, depositQuoteTimeBuffer, fillDeadlineBuffer, } = SvmSpoke_common_1.common;
+const { provider, connection, program, owner, seedBalance, initializeState, depositData, assertSE, assert, getCurrentTime, depositQuoteTimeBuffer, fillDeadlineBuffer, getOrCreateVaultAta, } = SvmSpoke_common_1.common;
 const maxExclusivityOffsetSeconds = new anchor_1.BN(test_utils_1.MAX_EXCLUSIVITY_OFFSET_SECONDS); // 1 year in seconds
 describe("svm_spoke.deposit", () => {
     anchor.setProvider(provider);
     const depositor = web3_js_1.Keypair.generate();
-    const payer = anchor.AnchorProvider.env().wallet.payer;
+    const { payer } = anchor.AnchorProvider.env().wallet;
     const tokenDecimals = 6;
     let state, inputToken, depositorTA, vault, tokenProgram;
     let seed;
     let depositAccounts;
-    let setEnableRouteAccounts; // Common variable for setEnableRoute accounts
     const setupInputToken = async () => {
         inputToken = await (0, spl_token_1.createMint)(connection, payer, owner, owner, tokenDecimals, undefined, undefined, tokenProgram);
         depositorTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, inputToken, depositor.publicKey, undefined, undefined, undefined, tokenProgram)).address;
         await (0, spl_token_1.mintTo)(connection, payer, inputToken, depositorTA, owner, seedBalance, undefined, undefined, tokenProgram);
     };
-    const enableRoute = async () => {
-        const routeChainId = new anchor_1.BN(1);
-        const route = createRoutePda(inputToken, seed, routeChainId);
-        vault = await getVaultAta(inputToken, state);
-        setEnableRouteAccounts = {
-            signer: owner,
-            payer: owner,
-            state,
-            route,
-            vault,
-            originTokenMint: inputToken, // Note the Sol expects this to be named originTokenMint.
-            tokenProgram: tokenProgram ?? spl_token_1.TOKEN_PROGRAM_ID,
-            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-            systemProgram: anchor.web3.SystemProgram.programId,
-        };
-        await program.methods.setEnableRoute(inputToken, routeChainId, true).accounts(setEnableRouteAccounts).rpc();
+    const createVault = async () => {
+        vault = await getOrCreateVaultAta(payer, inputToken, state);
         // Set known fields in the depositData.
         depositData.depositor = depositor.publicKey;
         depositData.inputToken = inputToken;
         depositAccounts = {
             state,
-            route,
+            delegate: (0, web3_v1_1.getDepositPda)(depositData, program.programId),
             signer: depositor.publicKey,
             depositorTokenAccount: depositorTA,
             vault,
@@ -81,30 +66,33 @@ describe("svm_spoke.deposit", () => {
             program: program.programId,
         };
     };
-    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 approvedDeposit = async (depositData, calledDepositAccounts = depositAccounts) => {
+        const delegatePda = (0, web3_v1_1.getDepositPda)(depositData, program.programId);
+        calledDepositAccounts.delegate = delegatePda;
+        // Delegate delegate PDA to pull depositor tokens.
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(calledDepositAccounts.depositorTokenAccount, calledDepositAccounts.mint, delegatePda, depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         const depositIx = await program.methods
-            .deposit(...depositDataValues)
+            .deposit(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, depositData.quoteTimestamp.toNumber(), depositData.fillDeadline.toNumber(), depositData.exclusivityParameter.toNumber(), depositData.message)
             .accounts(calledDepositAccounts)
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
-        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
-        return tx;
+        return (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [depositor]);
     };
+    before(async () => {
+        await connection.requestAirdrop(depositor.publicKey, 10_000_000_000); // 10 SOL
+    });
     beforeEach(async () => {
         ({ state, seed } = await initializeState());
         tokenProgram = spl_token_1.TOKEN_PROGRAM_ID; // Some tests might override this.
         await setupInputToken();
-        await enableRoute();
+        await createVault();
     });
     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 call
-        let depositDataValues = Object.values(depositData);
-        await approvedDeposit(depositDataValues);
+        await approvedDeposit(depositData);
         // 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");
@@ -114,8 +102,7 @@ describe("svm_spoke.deposit", () => {
         // Modify depositData for the second deposit
         const secondInputAmount = new anchor_1.BN(300000);
         // Execute the second deposit call
-        depositDataValues = Object.values({ ...depositData, inputAmount: secondInputAmount });
-        await approvedDeposit(depositDataValues);
+        await approvedDeposit({ ...depositData, inputAmount: secondInputAmount });
         // 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");
@@ -126,8 +113,7 @@ describe("svm_spoke.deposit", () => {
     it("Verifies FundsDeposited after deposits", async () => {
         depositData.inputAmount = depositData.inputAmount.add(new anchor_1.BN(69));
         // Execute the first deposit call
-        let depositDataValues = Object.values(depositData);
-        const tx = await approvedDeposit(depositDataValues);
+        const tx = await approvedDeposit(depositData);
         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.
@@ -139,8 +125,8 @@ describe("svm_spoke.deposit", () => {
         // Test the id recovery with the conversion utils
         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 approvedDeposit(depositDataValues);
+        // Execute the second deposit call
+        const tx2 = await approvedDeposit(depositData);
         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.
@@ -159,46 +145,11 @@ describe("svm_spoke.deposit", () => {
         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 tx = await approvedDeposit(depositData);
         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) {
-            throw new Error("Input token is null");
-        }
-        const differentRoutePda = createRoutePda(depositData.inputToken, seed, differentChainId);
-        depositAccounts.route = differentRoutePda;
-        try {
-            const depositDataValues = Object.values({
-                ...depositData,
-                destinationChainId: differentChainId,
-            });
-            await approvedDeposit(depositDataValues);
-            assert.fail("Deposit should have failed for a route that is not initialized");
-        }
-        catch (err) {
-            assert.include(err.toString(), "AccountNotInitialized", "Expected AccountNotInitialized error");
-        }
-    });
-    it("Fails to deposit tokens to a route that is explicitly disabled", async () => {
-        // Disable the route
-        await program.methods
-            .setEnableRoute(depositData.inputToken, depositData.destinationChainId, false)
-            .accounts(setEnableRouteAccounts)
-            .rpc();
-        try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
-            assert.fail("Deposit should have failed for a route that is explicitly disabled");
-        }
-        catch (err) {
-            assert.include(err.toString(), "DisabledRoute", "Expected DisabledRoute error");
-        }
-    });
     it("Fails to process deposit when deposits are paused", async () => {
         // Pause deposits
         const pauseDepositsAccounts = { state, signer: owner, program: program.programId };
@@ -207,8 +158,7 @@ describe("svm_spoke.deposit", () => {
         assert.isTrue(stateAccountData.pausedDeposits, "Deposits should be paused");
         // Try to deposit. This should fail because deposits are paused.
         try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
+            await approvedDeposit(depositData);
             assert.fail("Should not be able to process deposit when deposits are paused");
         }
         catch (err) {
@@ -220,8 +170,7 @@ describe("svm_spoke.deposit", () => {
         const futureQuoteTimestamp = new anchor_1.BN(currentTime + 10); // 10 seconds in the future
         depositData.quoteTimestamp = futureQuoteTimestamp;
         try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
+            await approvedDeposit(depositData);
             assert.fail("Deposit should have failed due to InvalidQuoteTimestamp");
         }
         catch (err) {
@@ -233,8 +182,7 @@ describe("svm_spoke.deposit", () => {
         const futureQuoteTimestamp = new anchor_1.BN(currentTime - depositQuoteTimeBuffer.toNumber() - 1); // older than buffer.
         depositData.quoteTimestamp = futureQuoteTimestamp;
         try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
+            await approvedDeposit(depositData);
             assert.fail("Deposit should have failed due to InvalidQuoteTimestamp");
         }
         catch (err) {
@@ -248,8 +196,7 @@ describe("svm_spoke.deposit", () => {
         depositData.fillDeadline = new anchor_1.BN(invalidFillDeadline);
         depositData.quoteTimestamp = new anchor_1.BN(currentTime);
         try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
+            await approvedDeposit(depositData);
             assert.fail("Deposit should have failed due to InvalidFillDeadline (future deadline)");
         }
         catch (err) {
@@ -257,101 +204,41 @@ describe("svm_spoke.deposit", () => {
         }
     });
     it("Fails to process deposit for mint inconsistent input_token", async () => {
-        // Save the correct data and accounts from global scope before changing it when creating a new input token.
+        // Save the correct data from global scope before changing it when creating a new input token.
         const firstInputToken = inputToken;
-        const firstDepositAccounts = depositAccounts;
-        // Create a new input token and enable the route (this updates global scope variables).
+        // Create a new input token and the vault.
         await setupInputToken();
-        await enableRoute();
-        // 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.
+        await createVault();
+        // Try to execute the deposit call with malformed inputs where the first input token 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 };
+        const malformedDepositAccounts = { ...depositAccounts };
         try {
-            const depositDataValues = Object.values(malformedDepositData);
-            await approvedDeposit(depositDataValues, malformedDepositAccounts);
+            await approvedDeposit(malformedDepositData, malformedDepositAccounts);
             assert.fail("Should not be able to process deposit for inconsistent mint");
         }
         catch (err) {
             assert.include(err.toString(), "Error Code: InvalidMint", "Expected InvalidMint error");
         }
     });
-    it("Tests deposit with a fake route PDA", async () => {
-        // Create fake program state
-        const fakeState = await initializeState();
-        const fakeVault = await getVaultAta(inputToken, fakeState.state);
-        const fakeRouteChainId = new anchor_1.BN(3);
-        const fakeRoutePda = createRoutePda(inputToken, fakeState.seed, fakeRouteChainId);
-        // A seeds constraint was violated.
-        const fakeSetEnableRouteAccounts = {
-            signer: owner,
-            payer: owner,
-            state: fakeState.state,
-            route: fakeRoutePda,
-            vault: fakeVault,
-            originTokenMint: inputToken,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
-            systemProgram: anchor.web3.SystemProgram.programId,
-            program: program.programId,
-        };
-        await program.methods.setEnableRoute(inputToken, fakeRouteChainId, true).accounts(fakeSetEnableRouteAccounts).rpc();
-        const fakeDepositAccounts = {
-            state: fakeState.state,
-            route: fakeRoutePda,
-            signer: depositor.publicKey,
-            depositorTokenAccount: depositorTA,
-            vault: fakeVault,
-            mint: inputToken,
-            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            program: program.programId,
-        };
-        // Deposit with the fake state and route PDA should succeed.
-        const depositDataValues = Object.values({
-            ...depositData,
-            destinationChainId: fakeRouteChainId,
-        });
-        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 = {
-            ...{ ...depositData, destinationChainId: fakeRouteChainId },
-            depositId: (0, web3_v1_1.intToU8Array32)(1),
-        }; // Verify the event props emitted match the depositData.
-        for (let [key, value] of Object.entries(expectedValues)) {
-            if (key === "exclusivityParameter")
-                key = "exclusivityDeadline"; // the prop and the event names differ on this key.
-            assertSE(event[key], value, `${key} should match`);
-        }
-        // Check fake vault acount balance
-        const fakeVaultAccount = await (0, spl_token_1.getAccount)(connection, fakeVault);
-        assertSE(fakeVaultAccount.amount, depositData.inputAmount.toNumber(), "Fake vault balance should be increased by the deposited amount");
-        // Deposit with the fake route in the original program state should fail.
-        try {
-            const depositDataValues = Object.values({
-                ...{ ...depositData, destinationChainId: fakeRouteChainId },
-            });
-            await approvedDeposit(depositDataValues, { ...depositAccounts, route: fakeRoutePda });
-            assert.fail("Deposit should have failed for a fake route PDA");
-        }
-        catch (err) {
-            assert.include(err.toString(), "A seeds constraint was violated");
-        }
-        const vaultAccount = await (0, spl_token_1.getAccount)(connection, vault);
-        assertSE(vaultAccount.amount, 0, "Vault balance should not be changed by the fake route deposit");
-    });
-    it("depositV3Now behaves as deposit but forces the quote timestamp as expected", async () => {
+    it("depositNow behaves as deposit but forces the quote timestamp as expected", async () => {
         // Set up initial deposit data. Note that this method has a slightly different interface to deposit, using
         // fillDeadlineOffset rather than fillDeadline. current chain time is added to fillDeadlineOffset to set the
         // fillDeadline for the deposit. exclusivityPeriod operates the same as in standard deposit.
-        // Equally, depositV3Now does not have `quoteTimestamp`. this is set to the current time from the program.
+        // Equally, depositNow does not have `quoteTimestamp`. this is set to the current time from the program.
         const fillDeadlineOffset = 60; // 60 seconds offset
+        const depositNowData = {
+            ...depositData,
+            fillDeadlineOffset: new anchor_1.BN(fillDeadlineOffset),
+            exclusivityPeriod: new anchor_1.BN(0),
+        };
+        const delegatePda = (0, web3_v1_1.getDepositNowPda)(depositNowData, program.programId);
         // 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);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, delegatePda, depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
         // Execute the deposit_now call. Remove the quoteTimestamp from the depositData as not needed for this method.
         const depositIx = await program.methods
-            .depositNow(depositData.depositor, depositData.recipient, depositData.inputToken, depositData.outputToken, depositData.inputAmount, depositData.outputAmount, depositData.destinationChainId, depositData.exclusiveRelayer, fillDeadlineOffset, 0, depositData.message)
-            .accounts(depositAccounts)
+            .depositNow(depositNowData.depositor, depositNowData.recipient, depositNowData.inputToken, depositNowData.outputToken, depositNowData.inputAmount, depositNowData.outputAmount, depositNowData.destinationChainId, depositNowData.exclusiveRelayer, fillDeadlineOffset, 0, depositNowData.message)
+            .accounts({ ...depositAccounts, delegate: delegatePda })
             .instruction();
         const depositTx = new web3_js_1.Transaction().add(approveIx, depositIx);
         const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [payer, depositor]);
@@ -378,8 +265,7 @@ describe("svm_spoke.deposit", () => {
         depositData.exclusiveRelayer = new web3_js_1.PublicKey("11111111111111111111111111111111");
         depositData.exclusivityParameter = new anchor_1.BN(1);
         try {
-            const depositDataValues = Object.values(depositData);
-            await approvedDeposit(depositDataValues);
+            await approvedDeposit(depositData);
             assert.fail("Should have failed due to InvalidExclusiveRelayer");
         }
         catch (err) {
@@ -395,8 +281,7 @@ describe("svm_spoke.deposit", () => {
         for (const exclusivityDeadline of invalidExclusivityDeadlines) {
             depositData.exclusivityParameter = exclusivityDeadline;
             try {
-                const depositDataValues = Object.values(depositData);
-                await approvedDeposit(depositDataValues);
+                await approvedDeposit(depositData);
                 assert.fail("Should have failed due to InvalidExclusiveRelayer");
             }
             catch (err) {
@@ -405,16 +290,14 @@ describe("svm_spoke.deposit", () => {
         }
         // Test with exclusivityDeadline set to 0
         depositData.exclusivityParameter = new anchor_1.BN(0);
-        const depositDataValues = Object.values(depositData);
-        await approvedDeposit(depositDataValues);
+        await approvedDeposit(depositData);
     });
     it("Exclusivity param is used as an offset", async () => {
         const currentTime = new anchor_1.BN(await getCurrentTime(program, state));
         depositData.quoteTimestamp = currentTime;
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = maxExclusivityOffsetSeconds;
-        const depositDataValues = Object.values(depositData);
-        const tx = await approvedDeposit(depositDataValues);
+        const tx = await approvedDeposit(depositData);
         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");
@@ -425,8 +308,7 @@ describe("svm_spoke.deposit", () => {
         const exclusivityDeadlineTimestamp = maxExclusivityOffsetSeconds.add(new anchor_1.BN(1)); // 1 year + 1 second
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = exclusivityDeadlineTimestamp;
-        const depositDataValues = Object.values(depositData);
-        const tx = await approvedDeposit(depositDataValues);
+        const tx = await approvedDeposit(depositData);
         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");
@@ -437,8 +319,7 @@ describe("svm_spoke.deposit", () => {
         const zeroExclusivity = new anchor_1.BN(0);
         depositData.exclusiveRelayer = depositor.publicKey;
         depositData.exclusivityParameter = zeroExclusivity;
-        const depositDataValues = Object.values(depositData);
-        const tx = await approvedDeposit(depositDataValues);
+        const tx = await approvedDeposit(depositData);
         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");
@@ -458,8 +339,8 @@ describe("svm_spoke.deposit", () => {
             .view();
         assert.strictEqual(expectedDepositIdArray.toString(), unsafeDepositIdTx.toString(), "Deposit ID should match the expected hash");
         // 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);
-        // Create the transaction for unsafeDepositV3
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, (0, web3_v1_1.getDepositPda)(depositData, program.programId), depositor.publicKey, BigInt(depositData.inputAmount.toString()), tokenDecimals, undefined, tokenProgram);
+        // Create the transaction for unsafeDeposit
         const unsafeDepositIx = await program.methods
             .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)
@@ -482,7 +363,7 @@ describe("svm_spoke.deposit", () => {
         // CPI-guard is available only for the 2022 token program.
         tokenProgram = spl_token_1.TOKEN_2022_PROGRAM_ID;
         await setupInputToken();
-        await enableRoute();
+        await createVault();
         // Enable CPI-guard for the depositor (requires TA reallocation).
         const enableCpiGuardTx = new web3_js_1.Transaction().add((0, spl_token_1.createReallocateInstruction)(depositorTA, payer.publicKey, [spl_token_1.ExtensionType.CpiGuard], depositor.publicKey), (0, spl_token_1.createEnableCpiGuardInstruction)(depositorTA, depositor.publicKey));
         await (0, web3_js_1.sendAndConfirmTransaction)(connection, enableCpiGuardTx, [payer, depositor]);
@@ -490,8 +371,7 @@ describe("svm_spoke.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 call
-        const depositDataValues = Object.values(depositData);
-        await approvedDeposit(depositDataValues);
+        await approvedDeposit(depositData);
         // 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");
@@ -513,6 +393,93 @@ describe("svm_spoke.deposit", () => {
             assert.include(err.toString(), "owner does not match");
         }
     });
+    it("Deposit native token, new token account", async () => {
+        // Fund depositor account with SOL.
+        const nativeAmount = 1_000_000_000; // 1 SOL
+        await connection.requestAirdrop(depositor.publicKey, nativeAmount * 2); // Add buffer for transaction fees.
+        // Setup wSOL as the input token.
+        inputToken = spl_token_1.NATIVE_MINT;
+        const nativeDecimals = 9;
+        depositorTA = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, depositor.publicKey);
+        await createVault();
+        // Will need to add rent exemption to the deposit amount, will recover it at the end of the transaction.
+        const rentExempt = await (0, spl_token_1.getMinimumBalanceForRentExemptAccount)(connection);
+        const transferIx = web3_js_1.SystemProgram.transfer({
+            fromPubkey: depositor.publicKey,
+            toPubkey: depositorTA,
+            lamports: BigInt(nativeAmount) + BigInt(rentExempt),
+        });
+        // Create wSOL user account.
+        const createIx = (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(depositor.publicKey, depositorTA, depositor.publicKey, inputToken);
+        const nativeDepositData = { ...depositData, inputAmount: new anchor_1.BN(nativeAmount), outputAmount: new anchor_1.BN(nativeAmount) };
+        const depositDataValues = Object.values(nativeDepositData);
+        const delegate = (0, web3_v1_1.getDepositPda)(nativeDepositData, program.programId);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, delegate, depositor.publicKey, BigInt(nativeAmount), nativeDecimals, undefined, tokenProgram);
+        const depositIx = await program.methods
+            .deposit(...depositDataValues)
+            .accounts({ ...depositAccounts, delegate })
+            .instruction();
+        const closeIx = (0, spl_token_1.createCloseAccountInstruction)(depositorTA, depositor.publicKey, depositor.publicKey);
+        const iVaultAmount = (await (0, spl_token_1.getAccount)(connection, vault, undefined, tokenProgram)).amount;
+        const depositTx = new web3_js_1.Transaction().add(transferIx, createIx, approveIx, depositIx, closeIx);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [depositor]);
+        const fVaultAmount = (await (0, spl_token_1.getAccount)(connection, vault, undefined, tokenProgram)).amount;
+        assertSE(fVaultAmount, iVaultAmount + BigInt(nativeAmount), "Vault balance should be increased by the deposited amount");
+    });
+    it("Deposit native token, existing token account", async () => {
+        // Fund depositor account with SOL.
+        const nativeAmount = 1_000_000_000; // 1 SOL
+        await connection.requestAirdrop(depositor.publicKey, nativeAmount * 2); // Add buffer for transaction fees.
+        // Setup wSOL as the input token, creating the associated token account for the user.
+        inputToken = spl_token_1.NATIVE_MINT;
+        const nativeDecimals = 9;
+        depositorTA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, inputToken, depositor.publicKey)).address;
+        await createVault();
+        // Transfer SOL to the user token account.
+        const transferIx = web3_js_1.SystemProgram.transfer({
+            fromPubkey: depositor.publicKey,
+            toPubkey: depositorTA,
+            lamports: nativeAmount,
+        });
+        // Sync the user token account with the native balance.
+        const syncIx = (0, spl_token_1.createSyncNativeInstruction)(depositorTA);
+        const nativeDepositData = { ...depositData, inputAmount: new anchor_1.BN(nativeAmount), outputAmount: new anchor_1.BN(nativeAmount) };
+        const depositDataValues = Object.values(nativeDepositData);
+        const delegate = (0, web3_v1_1.getDepositPda)(nativeDepositData, program.programId);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(depositAccounts.depositorTokenAccount, depositAccounts.mint, delegate, depositor.publicKey, BigInt(nativeAmount), nativeDecimals, undefined, tokenProgram);
+        const depositIx = await program.methods
+            .deposit(...depositDataValues)
+            .accounts({ ...depositAccounts, delegate })
+            .instruction();
+        const iVaultAmount = (await (0, spl_token_1.getAccount)(connection, vault, undefined, tokenProgram)).amount;
+        const depositTx = new web3_js_1.Transaction().add(transferIx, syncIx, approveIx, depositIx);
+        const tx = await (0, web3_js_1.sendAndConfirmTransaction)(connection, depositTx, [depositor]);
+        const fVaultAmount = (await (0, spl_token_1.getAccount)(connection, vault, undefined, tokenProgram)).amount;
+        assertSE(fVaultAmount, iVaultAmount + BigInt(nativeAmount), "Vault balance should be increased by the deposited amount");
+    });
+    it("Deposits tokens to a new vault", async () => {
+        // Create new input token without creating a new vault for it.
+        await setupInputToken();
+        const inputTokenAccount = await provider.connection.getAccountInfo(inputToken);
+        if (inputTokenAccount === null)
+            throw new Error("Input mint account not found");
+        vault = (0, spl_token_1.getAssociatedTokenAddressSync)(inputToken, state, true, inputTokenAccount.owner, spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID);
+        // Update global variables using the new input token.
+        depositData.inputToken = inputToken;
+        depositAccounts.depositorTokenAccount = depositorTA;
+        depositAccounts.vault = vault;
+        depositAccounts.mint = inputToken;
+        // Verify there is no vault account before the deposit.
+        assert.isNull(await provider.connection.getAccountInfo(vault), "Vault should not exist before the deposit");
+        // Execute the deposit call
+        await approvedDeposit(depositData);
+        // Verify tokens leave the depositor's account
+        const 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");
+        // Verify tokens are credited into the new vault
+        const vaultAccount = await (0, spl_token_1.getAccount)(connection, vault);
+        assertSE(vaultAccount.amount, depositData.inputAmount, "Vault balance should equal the deposited amount");
+    });
     describe("codama client and solana kit", () => {
         it("Deposit with with solana kit and codama client", async () => {
             // typescript is not happy with the depositData object
@@ -534,7 +501,7 @@ describe("svm_spoke.deposit", () => {
             const approveIx = (0, token_1.getApproveCheckedInstruction)({
                 source: (0, kit_1.address)(depositAccounts.depositorTokenAccount.toString()),
                 mint: (0, kit_1.address)(depositAccounts.mint.toString()),
-                delegate: (0, kit_1.address)(depositAccounts.state.toString()),
+                delegate: (0, kit_1.address)((0, web3_v1_1.getDepositPda)(depositData, program.programId).toString()),
                 owner: (0, kit_1.address)(depositor.publicKey.toString()),
                 amount: BigInt(depositData.inputAmount.toString()),
                 decimals: tokenDecimals,
@@ -555,7 +522,7 @@ describe("svm_spoke.deposit", () => {
             };
             const formattedAccounts = {
                 state: (0, kit_1.address)(depositAccounts.state.toString()),
-                route: (0, kit_1.address)(depositAccounts.route.toString()),
+                delegate: (0, kit_1.address)((0, web3_v1_1.getDepositPda)(depositData, program.programId).toString()),
                 depositorTokenAccount: (0, kit_1.address)(depositAccounts.depositorTokenAccount.toString()),
                 mint: (0, kit_1.address)(depositAccounts.mint.toString()),
                 tokenProgram: (0, kit_1.address)(tokenProgram.toString()),

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

@@ -36,20 +36,21 @@ const utils_1 = require("./utils");
 const { provider, connection, program, owner, chainId, seedBalance, initializeState, assertSE } = SvmSpoke_common_1.common;
 describe("svm_spoke.fill.across_plus", () => {
     anchor.setProvider(provider);
-    const payer = anchor.AnchorProvider.env().wallet.payer;
+    const { payer } = anchor.AnchorProvider.env().wallet;
     const relayer = web3_js_1.Keypair.generate();
     const handlerProgram = anchor.workspace.MulticallHandler;
-    let handlerSigner, handlerATA, finalRecipient, finalRecipientATA, state, mint, relayerATA;
+    let handlerSigner, handlerATA, finalRecipient, finalRecipientATA, state, mint, relayerATA, seed;
     const relayAmount = 500000;
     const mintDecimals = 6;
     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);
         accounts = {
             state,
+            delegate: (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda,
             signer: relayer.publicKey,
             instructionParams: program.programId,
             mint: mint,
@@ -60,31 +61,30 @@ describe("svm_spoke.fill.across_plus", () => {
             associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             systemProgram: anchor.web3.SystemProgram.programId,
         };
-    }
-    async function createApproveAndFillIx(multicallHandlerCoder, bufferParams = false) {
+    };
+    const createApproveAndFillIx = async (multicallHandlerCoder, bufferParams = false) => {
+        const relayHashUint8Array = (0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId);
+        const relayHash = Array.from(relayHashUint8Array);
         // Delegate state PDA to pull relayer tokens.
-        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, accounts.state, accounts.signer, BigInt(relayAmount), mintDecimals);
+        const approveIx = await (0, spl_token_1.createApproveCheckedInstruction)(accounts.relayerTokenAccount, accounts.mint, (0, web3_v1_1.getFillRelayDelegatePda)(relayHashUint8Array, new anchor_1.BN(1), relayer.publicKey, program.programId).pda, accounts.signer, BigInt(relayAmount), mintDecimals);
         const remainingAccounts = [
             { pubkey: handlerProgram.programId, isSigner: false, isWritable: false },
             ...multicallHandlerCoder.compiledKeyMetas,
         ];
-        const relayHash = Array.from((0, web3_v1_1.calculateRelayHashUint8Array)(relayData, chainId));
         // Prepare fill instruction.
-        const fillV3RelayValues = [relayHash, relayData, new anchor_1.BN(1), relayer.publicKey];
+        const fillRelayValues = [relayHash, relayData, new anchor_1.BN(1), relayer.publicKey];
         if (bufferParams) {
-            await (0, web3_v1_1.loadFillRelayParams)(program, relayer, fillV3RelayValues[1], fillV3RelayValues[2], fillV3RelayValues[3]);
+            await (0, web3_v1_1.loadFillRelayParams)(program, relayer, fillRelayValues[1], fillRelayValues[2], fillRelayValues[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 fillRelayParams = bufferParams ? [fillRelayValues[0], null, null, null] : fillRelayValues;
         const fillIx = await program.methods
-            .fillRelay(...fillV3RelayParams)
+            .fillRelay(...fillRelayParams)
             .accounts(accounts)
             .remainingAccounts(remainingAccounts)
             .instruction();
         return { approveIx, fillIx };
-    }
+    };
     before("Creates token mint and associated token accounts", async () => {
         mint = await (0, spl_token_1.createMint)(connection, payer, owner, owner, mintDecimals);
         relayerATA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, relayer.publicKey)).address;
@@ -96,7 +96,7 @@ describe("svm_spoke.fill.across_plus", () => {
     beforeEach(async () => {
         finalRecipient = web3_js_1.Keypair.generate().publicKey;
         finalRecipientATA = (await (0, spl_token_1.getOrCreateAssociatedTokenAccount)(connection, payer, mint, finalRecipient)).address;
-        ({ state } = await initializeState());
+        ({ state, seed } = await initializeState());
         const initialRelayData = {
             depositor: finalRecipient,
             recipient: handlerSigner, // Handler PDA that can forward tokens as needed within the message call.
@@ -279,9 +279,12 @@ describe("svm_spoke.fill.across_plus", () => {
                 programAddress: (0, kit_1.address)(program.programId.toString()),
                 seeds: ["__event_authority"],
             });
-            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)(relayerATA.toString()),
@@ -316,7 +319,7 @@ describe("svm_spoke.fill.across_plus", () => {
             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: mintDecimals,