test: update fill tests

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

Author: md0x

Diff for: test/svm/SvmSpoke.Fill.AcrossPlus.ts

@@ -34,12 +34,11 @@ import {
 import { MulticallHandler } from "../../target/types/multicall_handler";
 import { common } from "./SvmSpoke.common";
 import { FillDataParams, FillDataValues } from "../../src/types/svm";
-const { provider, connection, program, owner, chainId, seedBalance } = common;
-const { initializeState, assertSE } = common;
+const { provider, connection, program, owner, chainId, seedBalance, initializeState, assertSE } = common;
 
 describe("svm_spoke.fill.across_plus", () => {
   anchor.setProvider(provider);
-  const payer = (anchor.AnchorProvider.env().wallet as anchor.Wallet).payer;
+  const { payer } = anchor.AnchorProvider.env().wallet as anchor.Wallet;
   const relayer = Keypair.generate();
 
   const handlerProgram = anchor.workspace.MulticallHandler as Program<MulticallHandler>;
@@ -58,7 +57,7 @@ describe("svm_spoke.fill.across_plus", () => {
   let relayData: any; // reused relay data for all tests.
   let accounts: any; // Store accounts to simplify contract interactions.
 
-  function updateRelayData(newRelayData: any) {
+  const updateRelayData = (newRelayData: any) => {
     relayData = newRelayData;
     const relayHashUint8Array = calculateRelayHashUint8Array(relayData, chainId);
     const [fillStatusPDA] = PublicKey.findProgramAddressSync(
@@ -68,7 +67,7 @@ describe("svm_spoke.fill.across_plus", () => {
 
     accounts = {
       state,
-      delegate: getFillRelayDelegatePda(relayHashUint8Array, seed, program.programId),
+      delegate: getFillRelayDelegatePda(relayHashUint8Array, new BN(1), relayer.publicKey, program.programId).pda,
       signer: relayer.publicKey,
       instructionParams: program.programId,
       mint: mint,
@@ -79,17 +78,17 @@ describe("svm_spoke.fill.across_plus", () => {
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: anchor.web3.SystemProgram.programId,
     };
-  }
+  };
 
-  async function createApproveAndFillIx(multicallHandlerCoder: MulticallHandlerCoder, bufferParams = false) {
+  const createApproveAndFillIx = async (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,
-      getFillRelayDelegatePda(relayHashUint8Array, seed, program.programId),
+      getFillRelayDelegatePda(relayHashUint8Array, new BN(1), relayer.publicKey, program.programId).pda,
       accounts.signer,
       BigInt(relayAmount),
       mintDecimals
@@ -119,7 +118,7 @@ describe("svm_spoke.fill.across_plus", () => {
       .instruction();
 
     return { approveIx, fillIx };
-  }
+  };
 
   before("Creates token mint and associated token accounts", async () => {
     mint = await createMint(connection, payer, owner, owner, mintDecimals);

Diff for: test/svm/SvmSpoke.SlowFill.ts

@@ -23,12 +23,23 @@ import {
 } from "../../src/svm/web3-v1";
 import { testAcrossPlusMessage } from "./utils";
 
-const { provider, connection, program, owner, chainId, seedBalance, initializeState } = common;
-const { recipient, setCurrentTime, assertSE, assert } = common;
+const {
+  provider,
+  connection,
+  program,
+  owner,
+  chainId,
+  seedBalance,
+  initializeState,
+  recipient,
+  setCurrentTime,
+  assertSE,
+  assert,
+} = common;
 
 describe("svm_spoke.slow_fill", () => {
   anchor.setProvider(provider);
-  const payer = (anchor.AnchorProvider.env().wallet as anchor.Wallet).payer;
+  const { payer } = anchor.AnchorProvider.env().wallet as anchor.Wallet;
   const relayer = Keypair.generate();
   const otherRelayer = Keypair.generate();
   const { encodedMessage, fillRemainingAccounts } = testAcrossPlusMessage();
@@ -50,7 +61,7 @@ describe("svm_spoke.slow_fill", () => {
 
   const initialMintAmount = 10_000_000_000;
 
-  async function updateRelayData(newRelayData: SlowFillLeaf["relayData"]) {
+  const updateRelayData = async (newRelayData: SlowFillLeaf["relayData"]) => {
     relayData = newRelayData;
     const relayHashUint8Array = calculateRelayHashUint8Array(relayData, chainId);
     [fillStatus] = PublicKey.findProgramAddressSync([Buffer.from("fills"), relayHashUint8Array], program.programId);
@@ -69,6 +80,7 @@ describe("svm_spoke.slow_fill", () => {
     };
     fillAccounts = {
       state,
+      delegate: getFillRelayDelegatePda(relayHashUint8Array, new BN(1), relayer.publicKey, program.programId).pda,
       signer: relayer.publicKey,
       instructionParams: program.programId,
       mint: mint,
@@ -79,7 +91,7 @@ describe("svm_spoke.slow_fill", () => {
       associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
       systemProgram: anchor.web3.SystemProgram.programId,
     };
-  }
+  };
 
   const relaySlowFillRootBundle = async (
     slowRelayLeafRecipient = recipient,
@@ -118,7 +130,7 @@ describe("svm_spoke.slow_fill", () => {
     const leaf = slowRelayLeafs[0];
 
     let stateAccountData = await program.account.state.fetch(state);
-    const rootBundleId = stateAccountData.rootBundleId;
+    const { rootBundleId } = stateAccountData;
 
     const rootBundleIdBuffer = Buffer.alloc(4);
     rootBundleIdBuffer.writeUInt32LE(rootBundleId);
@@ -213,7 +225,9 @@ describe("svm_spoke.slow_fill", () => {
     Object.entries(relayData).forEach(([key, value]) => {
       if (key === "message") {
         assertSE(event.messageHash, hashNonEmptyMessage(value as Buffer), `MessageHash should match`);
-      } else assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
+      } else {
+        assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
+      }
     });
   });
 
@@ -225,7 +239,7 @@ describe("svm_spoke.slow_fill", () => {
     const approveIx = await createApproveCheckedInstruction(
       fillAccounts.relayerTokenAccount,
       fillAccounts.mint,
-      getFillRelayDelegatePda(relayHashUint8Array, seed, program.programId),
+      getFillRelayDelegatePda(relayHashUint8Array, new BN(1), relayer.publicKey, program.programId).pda,
       fillAccounts.signer,
       BigInt(relayData.outputAmount.toString()),
       tokenDecimals
@@ -386,7 +400,9 @@ describe("svm_spoke.slow_fill", () => {
     Object.entries(relayData).forEach(([key, value]) => {
       if (key === "message") {
         assertSE(event.messageHash, hashNonEmptyMessage(value as Buffer), `MessageHash should match`);
-      } else assertSE(event[key], value, `${key.charAt(0).toUpperCase() + key.slice(1)} should match`);
+      } 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");