fix(svm-sdk): compiled tx export logic mistakenly including current signer in the ouput (#8524)

xeno097 · web-flow · commit b643062a2f5d · 2026-04-07T15:11:25.000Z
diff --git a/.changeset/fix-svm-tx-fee-payer.md b/.changeset/fix-svm-tx-fee-payer.md
@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/sealevel-sdk": patch
+---
+
+Fixed serialized transaction output using the local keypair as fee payer instead of the actual authority (e.g. Squads vault). Added explicit feePayer field to SvmTransaction and set it on all update paths. Refactored IGP instruction builders to accept Address instead of TransactionSigner so the on-chain owner is used in serialized transactions.
diff --git a/typescript/svm-sdk/src/clients/signer.ts b/typescript/svm-sdk/src/clients/signer.ts
@@ -1,4 +1,5 @@
 import {
+  type Address,
   type Base64EncodedWireTransaction,
   type KeyPairSigner,
   type ReadonlyUint8Array,
@@ -22,6 +23,7 @@ import {
 
 import { type AltVM } from '@hyperlane-xyz/provider-sdk';
 import { assert, rootLogger, sleep, strip0x } from '@hyperlane-xyz/utils';
+import type { InstructionAccountMeta } from '../instructions/utils.js';
 
 import { createRpc } from '../rpc.js';
 import {
@@ -38,6 +40,24 @@ import type {
 import { SvmProvider } from './provider.js';
 import { DEFAULT_COMPUTE_UNITS } from '../constants.js';
 
+/** Transaction input for `send()` — feePayer is excluded since the signer provides it. */
+type SendableSvmTransaction = Omit<SvmTransaction, 'feePayer'>;
+
+/** Shape returned by `transactionToPrintableJson`. */
+export interface PrintableSvmTransaction {
+  annotation?: string;
+  instructions: PrintableSvmInstruction[];
+  computeUnits?: number;
+  transaction_base58: string;
+  message_base58: string;
+}
+
+export interface PrintableSvmInstruction {
+  programAddress: Address;
+  accounts?: readonly InstructionAccountMeta[];
+  data?: string;
+}
+
 type SignatureStatusResponse = Awaited<
   ReturnType<GetSignatureStatusesApi['getSignatureStatuses']>
 >['value'][0];
@@ -166,10 +186,10 @@ export class SvmSigner
 
   async transactionToPrintableJson(
     transaction: AnnotatedSvmTransaction,
-  ): Promise<object> {
+  ): Promise<PrintableSvmTransaction> {
     const { transactionBase58, messageBase58 } = serializeUnsignedTransaction(
       transaction.instructions,
-      this.signer.address,
+      transaction.feePayer ?? this.signer.address,
     );
 
     return {
@@ -191,7 +211,7 @@ export class SvmSigner
    * load-balanced RPC node desync.
    */
   private async signAndSend(
-    tx: SvmTransaction,
+    tx: SendableSvmTransaction,
     maxAttempts = 5,
   ): Promise<{
     signature: Signature;
@@ -285,7 +305,7 @@ export class SvmSigner
    * Sends a transaction and polls for confirmation. On blockhash expiry,
    * checks transaction history before resubmitting to prevent double-execution.
    */
-  async send(tx: SvmTransaction): Promise<SvmReceipt> {
+  async send(tx: SendableSvmTransaction): Promise<SvmReceipt> {
     const maxBlockhashAttempts = 3;
     const pollIntervalMs = 2000;
 
@@ -448,13 +468,13 @@ export class SvmSigner
   }
 
   async sendAndConfirmTransaction(
-    transaction: SvmTransaction,
+    transaction: SendableSvmTransaction,
   ): Promise<SvmReceipt> {
     return this.send(transaction);
   }
 
   async sendAndConfirmBatchTransactions(
-    _transactions: SvmTransaction[],
+    _transactions: SendableSvmTransaction[],
   ): Promise<SvmReceipt> {
     throw new Error('Sealevel does not support transaction batching');
   }
diff --git a/typescript/svm-sdk/src/core/mailbox.ts b/typescript/svm-sdk/src/core/mailbox.ts
@@ -182,6 +182,7 @@ export class SvmMailboxWriter
     const expectedIsm = expected.defaultIsm.deployed.address;
     if (!eqAddressSol(currentIsm, expectedIsm)) {
       txs.push({
+        feePayer: ownerAddress,
         instructions: [
           await buildSetDefaultIsmInstruction(
             programId,
@@ -201,6 +202,7 @@ export class SvmMailboxWriter
         ? parseAddress(expected.owner)
         : null;
       txs.push({
+        feePayer: ownerAddress,
         instructions: [
           await buildTransferMailboxOwnershipInstruction(
             programId,
diff --git a/typescript/svm-sdk/src/hook/igp-hook.ts b/typescript/svm-sdk/src/hook/igp-hook.ts
@@ -239,7 +239,7 @@ export class SvmIgpHookWriter
     if (oracleConfigs.length > 0) {
       const setOracleIx = await getSetGasOracleConfigsInstruction(
         programId,
-        this.svmSigner.signer,
+        this.svmSigner.signer.address,
         igpPda,
         oracleConfigs,
       );
@@ -273,7 +273,7 @@ export class SvmIgpHookWriter
 
       const setOverheadIx = await getSetDestinationGasOverheadsInstruction(
         programId,
-        this.svmSigner.signer,
+        this.svmSigner.signer.address,
         overheadIgpPda,
         overheadConfigs,
       );
@@ -311,6 +311,9 @@ export class SvmIgpHookWriter
       throw new Error('IGP account not initialized');
     }
 
+    assert(currentIgp.owner, `IGP ${programId} has no owner`);
+    const ownerAddress = currentIgp.owner;
+
     const { address: igpPda } = await deriveIgpAccountPda(programId, this.salt);
 
     const oracleConfigsToUpdate: GasOracleConfig[] = [];
@@ -358,12 +361,13 @@ export class SvmIgpHookWriter
     if (oracleConfigsToUpdate.length > 0) {
       const setOracleIx = await getSetGasOracleConfigsInstruction(
         programId,
-        this.svmSigner.signer,
+        ownerAddress,
         igpPda,
         oracleConfigsToUpdate,
       );
 
       txs.push({
+        feePayer: ownerAddress,
         instructions: [setOracleIx],
         annotation: `Update gas oracles for ${oracleConfigsToUpdate.length} domains`,
       });
@@ -404,12 +408,13 @@ export class SvmIgpHookWriter
 
       const setOverheadIx = await getSetDestinationGasOverheadsInstruction(
         programId,
-        this.svmSigner.signer,
+        ownerAddress,
         overheadIgpPda,
         overheadConfigsToUpdate,
       );
 
       txs.push({
+        feePayer: ownerAddress,
         instructions: [setOverheadIx],
         annotation: `Update gas overheads for ${overheadConfigsToUpdate.length} domains`,
       });
diff --git a/typescript/svm-sdk/src/instructions/igp.ts b/typescript/svm-sdk/src/instructions/igp.ts
@@ -34,6 +34,7 @@ import {
   readonlyAccount,
   writableAccount,
   writableSigner,
+  writableSignerAddress,
 } from './utils.js';
 
 export enum IgpInstructionKind {
@@ -283,7 +284,7 @@ function decodeInitOverheadIgp(data: Uint8Array): InitOverheadIgpData {
 
 export async function getSetGasOracleConfigsInstruction(
   programAddress: Address,
-  owner: TransactionSigner,
+  owner: Address,
   igpAccount: Address,
   configs: GasOracleConfig[],
 ): Promise<Instruction> {
@@ -292,15 +293,15 @@ export async function getSetGasOracleConfigsInstruction(
     [
       readonlyAccount(SYSTEM_PROGRAM_ADDRESS),
       writableAccount(igpAccount),
-      writableSigner(owner),
+      writableSignerAddress(owner),
     ],
     encodeIgpProgramInstruction({ kind: 'setGasOracleConfigs', configs }),
   );
 }
 
 export async function getSetDestinationGasOverheadsInstruction(
   programAddress: Address,
-  owner: TransactionSigner,
+  owner: Address,
   overheadIgpAccount: Address,
   configs: GasOverheadConfig[],
 ): Promise<Instruction> {
@@ -309,7 +310,7 @@ export async function getSetDestinationGasOverheadsInstruction(
     [
       readonlyAccount(SYSTEM_PROGRAM_ADDRESS),
       writableAccount(overheadIgpAccount),
-      writableSigner(owner),
+      writableSignerAddress(owner),
     ],
     encodeIgpProgramInstruction({
       kind: 'setDestinationGasOverheads',
diff --git a/typescript/svm-sdk/src/ism/multisig-ism.ts b/typescript/svm-sdk/src/ism/multisig-ism.ts
@@ -201,6 +201,7 @@ export class SvmMessageIdMultisigIsmWriter
     });
 
     return {
+      feePayer: this.svmSigner.signer.address,
       instructions: [ix],
       annotation: `Set validators for domain ${domain}`,
     };
diff --git a/typescript/svm-sdk/src/tests/signer.unit-test.ts b/typescript/svm-sdk/src/tests/signer.unit-test.ts
@@ -3,7 +3,14 @@ import {
   SOLANA_ERROR__TRANSACTION_ERROR__BLOCKHASH_NOT_FOUND,
   SolanaError,
 } from '@solana/errors';
-import { blockhash, signature as toSignature } from '@solana/kit';
+import {
+  AccountRole,
+  address,
+  blockhash,
+  getBase58Encoder,
+  getCompiledTransactionMessageDecoder,
+  signature as toSignature,
+} from '@solana/kit';
 import chai, { expect } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import { afterEach, describe, it } from 'mocha';
@@ -776,4 +783,80 @@ describe('SvmSigner', () => {
       expect(sendTxCalls).to.equal(1);
     });
   });
+
+  // ---- Fee payer derivation ----
+
+  // Deterministic fake addresses (valid base58, 32 bytes)
+  const OWNER_ADDRESS = address('11111111111111111111111111111112');
+  const SQUADS_VAULT_ADDRESS = address(
+    'zUeFx6cfxedG2JnFtMKkTXnxgPa5M44tyaF9RrPunCp',
+  );
+  const PROGRAM_ADDRESS = address('11111111111111111111111111111113');
+  const TOKEN_PDA_ADDRESS = address('11111111111111111111111111111114');
+
+  const base58Encoder = getBase58Encoder();
+  const messageDecoder = getCompiledTransactionMessageDecoder();
+
+  /** Decode a base58-encoded compiled message and return the fee payer (first static account). */
+  function feePayerFromMessageBase58(messageBase58: string): string {
+    const bytes = base58Encoder.encode(messageBase58);
+    const decoded = messageDecoder.decode(bytes);
+    return decoded.staticAccounts[0];
+  }
+
+  describe('transactionToPrintableJson — fee payer derivation', () => {
+    it('uses explicit feePayer instead of local signer', async () => {
+      const rpc = createMockRpc();
+      const signer = await createTestSigner(rpc);
+      const signerAddress = signer.getSignerAddress();
+
+      // feePayer differs from both the local signer and instruction accounts
+      expect(signerAddress).to.not.equal(SQUADS_VAULT_ADDRESS);
+      expect(OWNER_ADDRESS).to.not.equal(SQUADS_VAULT_ADDRESS);
+
+      const tx: SvmTransaction = {
+        feePayer: SQUADS_VAULT_ADDRESS,
+        instructions: [
+          {
+            programAddress: PROGRAM_ADDRESS,
+            accounts: [
+              { address: TOKEN_PDA_ADDRESS, role: AccountRole.WRITABLE },
+              { address: OWNER_ADDRESS, role: AccountRole.READONLY_SIGNER },
+            ],
+            data: new Uint8Array([0]),
+          },
+        ],
+      };
+
+      const json = await signer.transactionToPrintableJson(tx);
+
+      expect(feePayerFromMessageBase58(json.message_base58)).to.equal(
+        SQUADS_VAULT_ADDRESS,
+      );
+    });
+
+    it('falls back to local signer when instructions have no signers', async () => {
+      const rpc = createMockRpc();
+      const signer = await createTestSigner(rpc);
+      const signerAddress = signer.getSignerAddress();
+
+      const tx: SvmTransaction = {
+        instructions: [
+          {
+            programAddress: PROGRAM_ADDRESS,
+            accounts: [
+              { address: TOKEN_PDA_ADDRESS, role: AccountRole.WRITABLE },
+            ],
+            data: new Uint8Array([0]),
+          },
+        ],
+      };
+
+      const json = await signer.transactionToPrintableJson(tx);
+
+      expect(feePayerFromMessageBase58(json.message_base58)).to.equal(
+        signerAddress,
+      );
+    });
+  });
 });
diff --git a/typescript/svm-sdk/src/tests/warp-tx.unit-test.ts b/typescript/svm-sdk/src/tests/warp-tx.unit-test.ts
diff --git a/typescript/svm-sdk/src/types.ts b/typescript/svm-sdk/src/types.ts
diff --git a/typescript/svm-sdk/src/warp/warp-tx.ts b/typescript/svm-sdk/src/warp/warp-tx.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@hyperlane-xyz/sealevel-sdk": patch
 +---
++
 +Fixed serialized transaction output using the local keypair as fee payer instead of the actual authority (e.g. Squads vault). Added explicit feePayer field to SvmTransaction and set it on all update paths. Refactored IGP instruction builders to accept Address instead of TransactionSigner so the on-chain owner is used in serialized transactions.