chore(clients): regenerate clients and fix scripts

clients/ts/src/bridge/generated/accounts/bridge.ts

@@ -213,5 +213,5 @@ export async function fetchAllMaybeBridge(
 }
 
 export function getBridgeSize(): number {
-  return 508;
+  return 528;
 }

clients/ts/src/bridge/generated/errors/bridge.ts

@@ -102,6 +102,8 @@ export const BRIDGE_ERROR__INVALID_GAS_COST_SCALER_DP = 0x3206; // 12806
 export const BRIDGE_ERROR__INVALID_BLOCK_INTERVAL_REQUIREMENT = 0x3207; // 12807
 /** CreationWithNonZeroTarget: Creation with non-zero target */
 export const BRIDGE_ERROR__CREATION_WITH_NON_ZERO_TARGET = 0x3264; // 12900
+/** ZeroAddress: Zero address */
+export const BRIDGE_ERROR__ZERO_ADDRESS = 0x3265; // 12901
 
 export type BridgeError =
   | typeof BRIDGE_ERROR__ALREADY_EXECUTED
@@ -147,7 +149,8 @@ export type BridgeError =
   | typeof BRIDGE_ERROR__TOO_MANY_SIGNERS
   | typeof BRIDGE_ERROR__UNAUTHORIZED_CONFIG_UPDATE
   | typeof BRIDGE_ERROR__UNAUTHORIZED_INITIALIZATION
-  | typeof BRIDGE_ERROR__UNUSED_PROOF_ELEMENTS_REMAINING;
+  | typeof BRIDGE_ERROR__UNUSED_PROOF_ELEMENTS_REMAINING
+  | typeof BRIDGE_ERROR__ZERO_ADDRESS;
 
 let bridgeErrorMessages: Record<BridgeError, string> | undefined;
 if (process.env.NODE_ENV !== 'production') {
@@ -196,6 +199,7 @@ if (process.env.NODE_ENV !== 'production') {
     [BRIDGE_ERROR__UNAUTHORIZED_CONFIG_UPDATE]: `Unauthorized to update configuration`,
     [BRIDGE_ERROR__UNAUTHORIZED_INITIALIZATION]: `Only the upgrade authority can initialize the bridge`,
     [BRIDGE_ERROR__UNUSED_PROOF_ELEMENTS_REMAINING]: `Unused proof elements remaining`,
+    [BRIDGE_ERROR__ZERO_ADDRESS]: `Zero address`,
   };
 }
 

clients/ts/src/bridge/generated/instructions/bridgeCall.ts

@@ -155,7 +155,7 @@ export type BridgeCallInput<
   bridge: Address<TAccountBridge>;
   /**
    * The outgoing message account that stores the cross-chain call data.
-   * - Created fresh for each bridge call at a client-provided address (not a PDA)
+   * - Created fresh for each bridge call seeded by a client-provided salt
    * - Payer funds the account creation
    * - Space is DISCRIMINATOR_LEN + OutgoingMessage::space(...)` and is sized using
    * the worst-case message variant to ensure sufficient capacity even for large payloads
@@ -276,7 +276,7 @@ export type ParsedBridgeCallInstruction<
     bridge: TAccountMetas[3];
     /**
      * The outgoing message account that stores the cross-chain call data.
-     * - Created fresh for each bridge call at a client-provided address (not a PDA)
+     * - Created fresh for each bridge call seeded by a client-provided salt
      * - Payer funds the account creation
      * - Space is DISCRIMINATOR_LEN + OutgoingMessage::space(...)` and is sized using
      * the worst-case message variant to ensure sufficient capacity even for large payloads

clients/ts/src/bridge/generated/instructions/bridgeSol.ts

@@ -99,15 +99,13 @@ export type BridgeSolInstructionData = {
   discriminator: ReadonlyUint8Array;
   outgoingMessageSalt: ReadonlyUint8Array;
   to: ReadonlyUint8Array;
-  remoteToken: ReadonlyUint8Array;
   amount: bigint;
   call: Option<Call>;
 };
 
 export type BridgeSolInstructionDataArgs = {
   outgoingMessageSalt: ReadonlyUint8Array;
   to: ReadonlyUint8Array;
-  remoteToken: ReadonlyUint8Array;
   amount: number | bigint;
   call: OptionOrNullable<CallArgs>;
 };
@@ -118,7 +116,6 @@ export function getBridgeSolInstructionDataEncoder(): Encoder<BridgeSolInstructi
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['outgoingMessageSalt', fixEncoderSize(getBytesEncoder(), 32)],
       ['to', fixEncoderSize(getBytesEncoder(), 20)],
-      ['remoteToken', fixEncoderSize(getBytesEncoder(), 20)],
       ['amount', getU64Encoder()],
       ['call', getOptionEncoder(getCallEncoder())],
     ]),
@@ -131,7 +128,6 @@ export function getBridgeSolInstructionDataDecoder(): Decoder<BridgeSolInstructi
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['outgoingMessageSalt', fixDecoderSize(getBytesDecoder(), 32)],
     ['to', fixDecoderSize(getBytesDecoder(), 20)],
-    ['remoteToken', fixDecoderSize(getBytesDecoder(), 20)],
     ['amount', getU64Decoder()],
     ['call', getOptionDecoder(getCallDecoder())],
   ]);
@@ -170,7 +166,7 @@ export type BridgeSolInput<
   gasFeeReceiver: Address<TAccountGasFeeReceiver>;
   /**
    * The SOL vault account that holds locked tokens for the specific remote token.
-   * - Uses PDA with SOL_VAULT_SEED and remote_token for deterministic address
+   * - Uses PDA with SOL_VAULT_SEED for deterministic address
    * - Mutable to receive the locked SOL tokens
    * - Each remote token has its own dedicated vault
    *
@@ -196,7 +192,6 @@ export type BridgeSolInput<
   systemProgram?: Address<TAccountSystemProgram>;
   outgoingMessageSalt: BridgeSolInstructionDataArgs['outgoingMessageSalt'];
   to: BridgeSolInstructionDataArgs['to'];
-  remoteToken: BridgeSolInstructionDataArgs['remoteToken'];
   amount: BridgeSolInstructionDataArgs['amount'];
   call: BridgeSolInstructionDataArgs['call'];
 };
@@ -305,7 +300,7 @@ export type ParsedBridgeSolInstruction<
     gasFeeReceiver: TAccountMetas[2];
     /**
      * The SOL vault account that holds locked tokens for the specific remote token.
-     * - Uses PDA with SOL_VAULT_SEED and remote_token for deterministic address
+     * - Uses PDA with SOL_VAULT_SEED for deterministic address
      * - Mutable to receive the locked SOL tokens
      * - Each remote token has its own dedicated vault
      *

clients/ts/src/bridge/generated/instructions/bridgeSolWithBufferedCall.ts

@@ -100,14 +100,12 @@ export type BridgeSolWithBufferedCallInstructionData = {
   discriminator: ReadonlyUint8Array;
   outgoingMessageSalt: ReadonlyUint8Array;
   to: ReadonlyUint8Array;
-  remoteToken: ReadonlyUint8Array;
   amount: bigint;
 };
 
 export type BridgeSolWithBufferedCallInstructionDataArgs = {
   outgoingMessageSalt: ReadonlyUint8Array;
   to: ReadonlyUint8Array;
-  remoteToken: ReadonlyUint8Array;
   amount: number | bigint;
 };
 
@@ -117,7 +115,6 @@ export function getBridgeSolWithBufferedCallInstructionDataEncoder(): FixedSizeE
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['outgoingMessageSalt', fixEncoderSize(getBytesEncoder(), 32)],
       ['to', fixEncoderSize(getBytesEncoder(), 20)],
-      ['remoteToken', fixEncoderSize(getBytesEncoder(), 20)],
       ['amount', getU64Encoder()],
     ]),
     (value) => ({
@@ -132,7 +129,6 @@ export function getBridgeSolWithBufferedCallInstructionDataDecoder(): FixedSizeD
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['outgoingMessageSalt', fixDecoderSize(getBytesDecoder(), 32)],
     ['to', fixDecoderSize(getBytesDecoder(), 20)],
-    ['remoteToken', fixDecoderSize(getBytesDecoder(), 20)],
     ['amount', getU64Decoder()],
   ]);
 }
@@ -172,7 +168,7 @@ export type BridgeSolWithBufferedCallInput<
   gasFeeReceiver: Address<TAccountGasFeeReceiver>;
   /**
    * The SOL vault account that holds locked tokens for the specific remote token.
-   * - PDA of this program using `[SOL_VAULT_SEED, remote_token]`
+   * - PDA of this program using `[SOL_VAULT_SEED]`
    * - Mutable to receive the locked SOL
    * - Each remote token has its own dedicated vault
    *
@@ -203,7 +199,6 @@ export type BridgeSolWithBufferedCallInput<
   systemProgram?: Address<TAccountSystemProgram>;
   outgoingMessageSalt: BridgeSolWithBufferedCallInstructionDataArgs['outgoingMessageSalt'];
   to: BridgeSolWithBufferedCallInstructionDataArgs['to'];
-  remoteToken: BridgeSolWithBufferedCallInstructionDataArgs['remoteToken'];
   amount: BridgeSolWithBufferedCallInstructionDataArgs['amount'];
 };
 
@@ -323,7 +318,7 @@ export type ParsedBridgeSolWithBufferedCallInstruction<
     gasFeeReceiver: TAccountMetas[2];
     /**
      * The SOL vault account that holds locked tokens for the specific remote token.
-     * - PDA of this program using `[SOL_VAULT_SEED, remote_token]`
+     * - PDA of this program using `[SOL_VAULT_SEED]`
      * - Mutable to receive the locked SOL
      * - Each remote token has its own dedicated vault
      *

clients/ts/src/bridge/generated/types/finalizeBridgeSol.ts

@@ -8,12 +8,8 @@
 
 import {
   combineCodec,
-  fixDecoderSize,
-  fixEncoderSize,
   getAddressDecoder,
   getAddressEncoder,
-  getBytesDecoder,
-  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
@@ -22,7 +18,6 @@ import {
   type FixedSizeCodec,
   type FixedSizeDecoder,
   type FixedSizeEncoder,
-  type ReadonlyUint8Array,
 } from '@solana/kit';
 
 /**
@@ -33,12 +28,6 @@ import {
  * the recipient when finalized.
  */
 export type FinalizeBridgeSol = {
-  /**
-   * The 20-byte EVM address on Base of the ERC-20 token that represents SOL for this bridge.
-   * Used as a seed to derive the SOL vault PDA that escrows SOL for this mapping.
-   * This identifier names the vault even though the asset released here is native SOL.
-   */
-  remoteToken: ReadonlyUint8Array;
   /**
    * The Solana public key of the recipient who will receive the SOL.
    * This must match the intended recipient specified in the original bridge message.
@@ -52,12 +41,6 @@ export type FinalizeBridgeSol = {
 };
 
 export type FinalizeBridgeSolArgs = {
-  /**
-   * The 20-byte EVM address on Base of the ERC-20 token that represents SOL for this bridge.
-   * Used as a seed to derive the SOL vault PDA that escrows SOL for this mapping.
-   * This identifier names the vault even though the asset released here is native SOL.
-   */
-  remoteToken: ReadonlyUint8Array;
   /**
    * The Solana public key of the recipient who will receive the SOL.
    * This must match the intended recipient specified in the original bridge message.
@@ -72,15 +55,13 @@ export type FinalizeBridgeSolArgs = {
 
 export function getFinalizeBridgeSolEncoder(): FixedSizeEncoder<FinalizeBridgeSolArgs> {
   return getStructEncoder([
-    ['remoteToken', fixEncoderSize(getBytesEncoder(), 20)],
     ['to', getAddressEncoder()],
     ['amount', getU64Encoder()],
   ]);
 }
 
 export function getFinalizeBridgeSolDecoder(): FixedSizeDecoder<FinalizeBridgeSol> {
   return getStructDecoder([
-    ['remoteToken', fixDecoderSize(getBytesDecoder(), 20)],
     ['to', getAddressDecoder()],
     ['amount', getU64Decoder()],
   ]);

clients/ts/src/bridge/generated/types/protocolConfig.ts

@@ -8,13 +8,18 @@
 
 import {
   combineCodec,
+  fixDecoderSize,
+  fixEncoderSize,
+  getBytesDecoder,
+  getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
   getU64Decoder,
   getU64Encoder,
   type FixedSizeCodec,
   type FixedSizeDecoder,
   type FixedSizeEncoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 
 export type ProtocolConfig = {
@@ -23,6 +28,8 @@ export type ProtocolConfig = {
    * submitted output root must be a multiple of this number.
    */
   blockIntervalRequirement: bigint;
+  /** The Base evm address of SOL */
+  remoteSolAddress: ReadonlyUint8Array;
 };
 
 export type ProtocolConfigArgs = {
@@ -31,14 +38,22 @@ export type ProtocolConfigArgs = {
    * submitted output root must be a multiple of this number.
    */
   blockIntervalRequirement: number | bigint;
+  /** The Base evm address of SOL */
+  remoteSolAddress: ReadonlyUint8Array;
 };
 
 export function getProtocolConfigEncoder(): FixedSizeEncoder<ProtocolConfigArgs> {
-  return getStructEncoder([['blockIntervalRequirement', getU64Encoder()]]);
+  return getStructEncoder([
+    ['blockIntervalRequirement', getU64Encoder()],
+    ['remoteSolAddress', fixEncoderSize(getBytesEncoder(), 20)],
+  ]);
 }
 
 export function getProtocolConfigDecoder(): FixedSizeDecoder<ProtocolConfig> {
-  return getStructDecoder([['blockIntervalRequirement', getU64Decoder()]]);
+  return getStructDecoder([
+    ['blockIntervalRequirement', getU64Decoder()],
+    ['remoteSolAddress', fixDecoderSize(getBytesDecoder(), 20)],
+  ]);
 }
 
 export function getProtocolConfigCodec(): FixedSizeCodec<

scripts/src/commands/sol/bridge/base-to-solana/relay-message.handler.ts

@@ -14,6 +14,7 @@ import { TOKEN_2022_PROGRAM_ADDRESS } from "@solana-program/token-2022";
 import { toBytes, toHex } from "viem";
 
 import {
+  fetchBridge,
   fetchIncomingMessage,
   getRelayMessageInstruction,
   type BridgeBaseToSolanaStateIncomingMessageMessage,
@@ -254,19 +255,15 @@ async function messageTransferSolAccounts(
 ) {
   logger.info("SOL transfer detected");
 
-  const { remoteToken, to, amount } = message.fields[0];
+  const { to, amount } = message.fields[0];
 
   logger.info(`SOL transfer:`);
-  logger.info(`  Remote token: 0x${remoteToken.toHex()}`);
   logger.info(`  To: ${to}`);
   logger.info(`  Amount: ${amount}`);
 
   const [solVaultPda] = await getProgramDerivedAddress({
     programAddress: solanaBridge,
-    seeds: [
-      Buffer.from(getIdlConstant("SOL_VAULT_SEED")),
-      Buffer.from(remoteToken),
-    ],
+    seeds: [Buffer.from(getIdlConstant("SOL_VAULT_SEED"))],
   });
   logger.info(`SOL vault PDA: ${solVaultPda}`);
 

scripts/src/commands/sol/bridge/initialize.command.ts

@@ -4,6 +4,7 @@ import { text, isCancel, cancel } from "@clack/prompts";
 import {
   getOrPromptBigint,
   getOrPromptSolanaAddress,
+  getOrPromptEvmAddress,
   getOrPromptEvmAddressList,
   getOrPromptFilePath,
   validateAndExecute,
@@ -15,6 +16,7 @@ type CommanderOptions = {
   rpcUrl?: string;
   payerKp?: string;
   guardian?: string;
+  remoteSolAddress?: string;
   eip1559Target?: string;
   eip1559Denominator?: string;
   eip1559WindowDurationSeconds?: string;
@@ -77,6 +79,11 @@ async function collectInteractiveOptions(
     ["payer"]
   );
 
+  opts.remoteSolAddress = await getOrPromptEvmAddress(
+    opts.remoteSolAddress,
+    "Enter remote SOL address (EVM address)"
+  );
+
   opts.eip1559Target = await getOrPromptBigint(
     opts.eip1559Target,
     "Enter EIP-1559 target (bigint)"
@@ -157,6 +164,10 @@ export const initializeCommand = new Command("initialize")
     "--guardian <address>",
     "Guardian address: 'payer' or Solana public key"
   )
+  .option(
+    "--remote-sol-address <address>",
+    "Remote SOL address (EVM address)"
+  )
   .option("--eip1559-target <uint>", "EIP-1559 target (bigint)")
   .option("--eip1559-denominator <uint>", "EIP-1559 denominator (bigint)")
   .option(

scripts/src/commands/sol/bridge/initialize.handler.ts

@@ -63,6 +63,7 @@ const gasFlatSchema = z.object({
 
 const protocolFlatSchema = z.object({
   protocolBlockIntervalRequirement: bigintSchema,
+  remoteSolAddress: evmAddressSchema,
 });
 
 const bufferFlatSchema = z.object({
@@ -142,6 +143,7 @@ export async function handleInitialize(args: InitializeArgs): Promise<void> {
 
     const protocolConfig: ProtocolConfig = {
       blockIntervalRequirement: args.protocolBlockIntervalRequirement,
+      remoteSolAddress: toBytes(args.remoteSolAddress),
     };
 
     const bufferConfig: BufferConfig = {
@@ -298,6 +300,12 @@ async function assertInitialized(
   ) {
     throw new Error("Protocol config blockIntervalRequirement mismatch!");
   }
+  if (
+    toHex(new Uint8Array(bridgeData.data.protocolConfig.remoteSolAddress)) !==
+    toHex(new Uint8Array(protocolConfig.remoteSolAddress))
+  ) {
+    throw new Error("Protocol config remoteSolAddress mismatch!");
+  }
 
   // Buffer config confirmation
   if (