fix: across plus

Signed-off-by: Pablo Maldonado <[email protected]>

Author: md0x

test/svm/SvmSpoke.Fill.AcrossPlus.ts

@@ -33,6 +33,7 @@ import {
 import { MulticallHandler } from "../../target/types/multicall_handler";
 import { common } from "./SvmSpoke.common";
 import { FillDataParams, FillDataValues } from "../../src/types/svm";
+import { getDelegatePdaFillRelay } from "./utils";
 const { provider, connection, program, owner, chainId, seedBalance } = common;
 const { initializeState, assertSE } = common;
 
@@ -49,7 +50,8 @@ describe("svm_spoke.fill.across_plus", () => {
     finalRecipientATA: PublicKey,
     state: PublicKey,
     mint: PublicKey,
-    relayerATA: PublicKey;
+    relayerATA: PublicKey,
+    seed: BN;
 
   const relayAmount = 500000;
   const mintDecimals = 6;
@@ -66,6 +68,7 @@ describe("svm_spoke.fill.across_plus", () => {
 
     accounts = {
       state,
+      delegate: getDelegatePdaFillRelay(relayHashUint8Array, seed, program.programId),
       signer: relayer.publicKey,
       instructionParams: program.programId,
       mint: mint,
@@ -79,11 +82,14 @@ describe("svm_spoke.fill.across_plus", () => {
   }
 
   async function createApproveAndFillIx(multicallHandlerCoder: MulticallHandlerCoder, bufferParams = false) {
+    const relayHashUint8Array = calculateRelayHashUint8Array(relayData, chainId);
+    const relayHash = Array.from(relayHashUint8Array);
+
     // Delegate state PDA to pull relayer tokens.
     const approveIx = await createApproveCheckedInstruction(
       accounts.relayerTokenAccount,
       accounts.mint,
-      accounts.state,
+      getDelegatePdaFillRelay(relayHashUint8Array, seed, program.programId),
       accounts.signer,
       BigInt(relayAmount),
       mintDecimals
@@ -94,8 +100,6 @@ describe("svm_spoke.fill.across_plus", () => {
       ...multicallHandlerCoder.compiledKeyMetas,
     ];
 
-    const relayHash = Array.from(calculateRelayHashUint8Array(relayData, chainId));
-
     // Prepare fill instruction.
     const fillV3RelayValues: FillDataValues = [relayHash, relayData, new BN(1), relayer.publicKey];
     if (bufferParams) {
@@ -133,7 +137,7 @@ describe("svm_spoke.fill.across_plus", () => {
     finalRecipient = Keypair.generate().publicKey;
     finalRecipientATA = (await getOrCreateAssociatedTokenAccount(connection, payer, mint, finalRecipient)).address;
 
-    ({ state } = await initializeState());
+    ({ state, seed } = await initializeState());
 
     const initialRelayData = {
       depositor: finalRecipient,

test/svm/SvmSpoke.Fill.ts

@@ -75,7 +75,7 @@ describe("svm_spoke.fill", () => {
 
     accounts = {
       state,
-      delegate: getDelegatePda(relayHashUint8Array, seed),
+      delegate: getDelegatePdaFillRelay(relayHashUint8Array, seed, program.programId),
       signer: relayer.publicKey,
       instructionParams: program.programId,
       mint: mint,
@@ -89,13 +89,6 @@ describe("svm_spoke.fill", () => {
     };
   }
 
-  const getDelegatePda = (relayHash: Uint8Array, stateSeed: BN) => {
-    return PublicKey.findProgramAddressSync(
-      [Buffer.from("delegate"), stateSeed.toArrayLike(Buffer, "le", 8), relayHash],
-      program.programId
-    )[0];
-  };
-
   const approvedFillRelay = async (
     fillDataValues: FillDataValues,
     calledFillAccounts: FillAccounts = accounts,
@@ -106,7 +99,7 @@ describe("svm_spoke.fill", () => {
     const approveIx = await createApproveCheckedInstruction(
       calledFillAccounts.relayerTokenAccount,
       calledFillAccounts.mint,
-      getDelegatePda(relayHash, seed),
+      getDelegatePdaFillRelay(relayHash, seed, program.programId),
       calledFillAccounts.signer,
       BigInt(fillDataValues[1].outputAmount.toString()),
       tokenDecimals,
@@ -466,7 +459,7 @@ describe("svm_spoke.fill", () => {
     const approveInstruction = await createApproveCheckedInstruction(
       accounts.relayerTokenAccount,
       accounts.mint,
-      getDelegatePda(relayHashUint8Array, seed),
+      getDelegatePdaFillRelay(relayHashUint8Array, seed, program.programId),
       accounts.signer,
       BigInt(newRelayData.outputAmount.toString()),
       tokenDecimals,
@@ -527,7 +520,7 @@ describe("svm_spoke.fill", () => {
       const approveInstruction = await createApproveCheckedInstruction(
         accounts.relayerTokenAccount,
         accounts.mint,
-        getDelegatePda(relayHashUint8Array, seed),
+        getDelegatePdaFillRelay(relayHashUint8Array, seed, program.programId),
         accounts.signer,
         BigInt(totalFillAmount.toString()),
         tokenDecimals,

test/svm/utils.ts

@@ -211,3 +211,10 @@ export const generateKeyPairSignerWithSol = async (rpcClient: RpcClient, putativ
   });
   return signer;
 };
+
+export const getDelegatePdaFillRelay = (relayHash: Uint8Array, stateSeed: BN, programId: PublicKey) => {
+  return PublicKey.findProgramAddressSync(
+    [Buffer.from("delegate"), stateSeed.toArrayLike(Buffer, "le", 8), relayHash],
+    programId
+  )[0];
+};