Skip to content

chore(clients): regenerate clients and fix scripts #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackchuma merged 1 commit into from
Oct 16, 2025
Merged

chore(clients): regenerate clients and fix scripts #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions clients/ts/src/base-relayer/generated/errors/baseRelayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,36 @@ import {
} from '@solana/kit';
import { BASE_RELAYER_PROGRAM_ADDRESS } from '../programs';

/** UnauthorizedInitialization: Only the upgrade authority can initialize the relayer */
export const BASE_RELAYER_ERROR__UNAUTHORIZED_INITIALIZATION = 0x2ee0; // 12000
/** IncorrectRelayerProgram: Incorrect relayer program */
export const BASE_RELAYER_ERROR__INCORRECT_RELAYER_PROGRAM = 0x2ee1; // 12001
/** UnauthorizedConfigUpdate: Unauthorized to update configuration */
export const BASE_RELAYER_ERROR__UNAUTHORIZED_CONFIG_UPDATE = 0x2f44; // 12100
/** GasLimitTooLow: Gas limit too low */
export const BASE_RELAYER_ERROR__GAS_LIMIT_TOO_LOW = 0x1770; // 6000
export const BASE_RELAYER_ERROR__GAS_LIMIT_TOO_LOW = 0x2fa8; // 12200
/** GasLimitExceeded: Gas limit exceeded */
export const BASE_RELAYER_ERROR__GAS_LIMIT_EXCEEDED = 0x1771; // 6001
export const BASE_RELAYER_ERROR__GAS_LIMIT_EXCEEDED = 0x2fa9; // 12201
/** IncorrectGasFeeReceiver: Incorrect gas fee receiver */
export const BASE_RELAYER_ERROR__INCORRECT_GAS_FEE_RECEIVER = 0x300c; // 12300

export type BaseRelayerError =
| typeof BASE_RELAYER_ERROR__GAS_LIMIT_EXCEEDED
| typeof BASE_RELAYER_ERROR__GAS_LIMIT_TOO_LOW;
| typeof BASE_RELAYER_ERROR__GAS_LIMIT_TOO_LOW
| typeof BASE_RELAYER_ERROR__INCORRECT_GAS_FEE_RECEIVER
| typeof BASE_RELAYER_ERROR__INCORRECT_RELAYER_PROGRAM
| typeof BASE_RELAYER_ERROR__UNAUTHORIZED_CONFIG_UPDATE
| typeof BASE_RELAYER_ERROR__UNAUTHORIZED_INITIALIZATION;

let baseRelayerErrorMessages: Record<BaseRelayerError, string> | undefined;
if (process.env.NODE_ENV !== 'production') {
baseRelayerErrorMessages = {
[BASE_RELAYER_ERROR__GAS_LIMIT_EXCEEDED]: `Gas limit exceeded`,
[BASE_RELAYER_ERROR__GAS_LIMIT_TOO_LOW]: `Gas limit too low`,
[BASE_RELAYER_ERROR__INCORRECT_GAS_FEE_RECEIVER]: `Incorrect gas fee receiver`,
[BASE_RELAYER_ERROR__INCORRECT_RELAYER_PROGRAM]: `Incorrect relayer program`,
[BASE_RELAYER_ERROR__UNAUTHORIZED_CONFIG_UPDATE]: `Unauthorized to update configuration`,
[BASE_RELAYER_ERROR__UNAUTHORIZED_INITIALIZATION]: `Only the upgrade authority can initialize the relayer`,
};
}

Expand Down
117 changes: 83 additions & 34 deletions clients/ts/src/base-relayer/generated/instructions/initialize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ export function getInitializeDiscriminatorBytes() {

export type InitializeInstruction<
TProgram extends string = typeof BASE_RELAYER_PROGRAM_ADDRESS,
TAccountUpgradeAuthority extends string | AccountMeta<string> = string,
TAccountPayer extends string | AccountMeta<string> = string,
TAccountCfg extends string | AccountMeta<string> = string,
TAccountGuardian extends string | AccountMeta<string> = string,
TAccountProgramData extends string | AccountMeta<string> = string,
TAccountProgram extends string | AccountMeta<string> = string,
TAccountSystemProgram extends
| string
| AccountMeta<string> = '11111111111111111111111111111111',
Expand All @@ -67,15 +69,21 @@ export type InitializeInstruction<
InstructionWithData<ReadonlyUint8Array> &
InstructionWithAccounts<
[
TAccountUpgradeAuthority extends string
? ReadonlySignerAccount<TAccountUpgradeAuthority> &
AccountSignerMeta<TAccountUpgradeAuthority>
: TAccountUpgradeAuthority,
TAccountPayer extends string
? WritableSignerAccount<TAccountPayer> &
AccountSignerMeta<TAccountPayer>
: TAccountPayer,
TAccountCfg extends string ? WritableAccount<TAccountCfg> : TAccountCfg,
TAccountGuardian extends string
? ReadonlySignerAccount<TAccountGuardian> &
AccountSignerMeta<TAccountGuardian>
: TAccountGuardian,
TAccountProgramData extends string
? ReadonlyAccount<TAccountProgramData>
: TAccountProgramData,
TAccountProgram extends string
? ReadonlyAccount<TAccountProgram>
: TAccountProgram,
TAccountSystemProgram extends string
? ReadonlyAccount<TAccountSystemProgram>
: TAccountSystemProgram,
Expand All @@ -85,13 +93,13 @@ export type InitializeInstruction<

export type InitializeInstructionData = {
discriminator: ReadonlyUint8Array;
newGuardian: Address;
guardian: Address;
eip1559Config: Eip1559Config;
gasConfig: GasConfig;
};

export type InitializeInstructionDataArgs = {
newGuardian: Address;
guardian: Address;
eip1559Config: Eip1559ConfigArgs;
gasConfig: GasConfigArgs;
};
Expand All @@ -100,7 +108,7 @@ export function getInitializeInstructionDataEncoder(): FixedSizeEncoder<Initiali
return transformEncoder(
getStructEncoder([
['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
['newGuardian', getAddressEncoder()],
['guardian', getAddressEncoder()],
['eip1559Config', getEip1559ConfigEncoder()],
['gasConfig', getGasConfigEncoder()],
]),
Expand All @@ -111,7 +119,7 @@ export function getInitializeInstructionDataEncoder(): FixedSizeEncoder<Initiali
export function getInitializeInstructionDataDecoder(): FixedSizeDecoder<InitializeInstructionData> {
return getStructDecoder([
['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
['newGuardian', getAddressDecoder()],
['guardian', getAddressDecoder()],
['eip1559Config', getEip1559ConfigDecoder()],
['gasConfig', getGasConfigDecoder()],
]);
Expand All @@ -128,67 +136,91 @@ export function getInitializeInstructionDataCodec(): FixedSizeCodec<
}

export type InitializeInput<
TAccountUpgradeAuthority extends string = string,
TAccountPayer extends string = string,
TAccountCfg extends string = string,
TAccountGuardian extends string = string,
TAccountProgramData extends string = string,
TAccountProgram extends string = string,
TAccountSystemProgram extends string = string,
> = {
/**
* The account that pays for the transaction and bridge account creation.
* The upgrade authority that is authorized to initialize the relayer.
* This ensures only the program deployer can set the initial configuration.
*/
upgradeAuthority: TransactionSigner<TAccountUpgradeAuthority>;
/**
* The account that pays for the transaction and config account creation.
* Must be mutable to deduct lamports for account rent.
* Can be different from the upgrade_authority.
*/
payer: TransactionSigner<TAccountPayer>;
/**
* The relayer config state account that tracks fee parameters.
* - Uses PDA with CFG_SEED for deterministic address
* - Mutable to update EIP1559 fee data
* - Payer funds the account creation
* - Space allocated for config state (DISCRIMINATOR_LEN + Cfg::INIT_SPACE)
*/
cfg: Address<TAccountCfg>;
/**
* The guardian account that will have administrative authority over the bridge.
* Must be a signer to prove ownership of the guardian key. The payer and guardian
* may be distinct signers.
* Program data account containing the upgrade authority.
* Validates that the signer is indeed the upgrade authority.
*/
guardian: TransactionSigner<TAccountGuardian>;
programData: Address<TAccountProgramData>;
/**
* The base_relayer program itself.
* Validates that program_data is the correct ProgramData account for this program.
*/
program: Address<TAccountProgram>;
/**
* System program required for creating new accounts.
* Used internally by Anchor for account initialization.
*/
systemProgram?: Address<TAccountSystemProgram>;
newGuardian: InitializeInstructionDataArgs['newGuardian'];
guardian: InitializeInstructionDataArgs['guardian'];
eip1559Config: InitializeInstructionDataArgs['eip1559Config'];
gasConfig: InitializeInstructionDataArgs['gasConfig'];
};

export function getInitializeInstruction<
TAccountUpgradeAuthority extends string,
TAccountPayer extends string,
TAccountCfg extends string,
TAccountGuardian extends string,
TAccountProgramData extends string,
TAccountProgram extends string,
TAccountSystemProgram extends string,
TProgramAddress extends Address = typeof BASE_RELAYER_PROGRAM_ADDRESS,
>(
input: InitializeInput<
TAccountUpgradeAuthority,
TAccountPayer,
TAccountCfg,
TAccountGuardian,
TAccountProgramData,
TAccountProgram,
TAccountSystemProgram
>,
config?: { programAddress?: TProgramAddress }
): InitializeInstruction<
TProgramAddress,
TAccountUpgradeAuthority,
TAccountPayer,
TAccountCfg,
TAccountGuardian,
TAccountProgramData,
TAccountProgram,
TAccountSystemProgram
> {
// Program address.
const programAddress = config?.programAddress ?? BASE_RELAYER_PROGRAM_ADDRESS;

// Original accounts.
const originalAccounts = {
upgradeAuthority: {
value: input.upgradeAuthority ?? null,
isWritable: false,
},
payer: { value: input.payer ?? null, isWritable: true },
cfg: { value: input.cfg ?? null, isWritable: true },
guardian: { value: input.guardian ?? null, isWritable: false },
programData: { value: input.programData ?? null, isWritable: false },
program: { value: input.program ?? null, isWritable: false },
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
};
const accounts = originalAccounts as Record<
Expand All @@ -208,9 +240,11 @@ export function getInitializeInstruction<
const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
return Object.freeze({
accounts: [
getAccountMeta(accounts.upgradeAuthority),
getAccountMeta(accounts.payer),
getAccountMeta(accounts.cfg),
getAccountMeta(accounts.guardian),
getAccountMeta(accounts.programData),
getAccountMeta(accounts.program),
getAccountMeta(accounts.systemProgram),
],
data: getInitializeInstructionDataEncoder().encode(
Expand All @@ -219,9 +253,11 @@ export function getInitializeInstruction<
programAddress,
} as InitializeInstruction<
TProgramAddress,
TAccountUpgradeAuthority,
TAccountPayer,
TAccountCfg,
TAccountGuardian,
TAccountProgramData,
TAccountProgram,
TAccountSystemProgram
>);
}
Expand All @@ -233,27 +269,38 @@ export type ParsedInitializeInstruction<
programAddress: Address<TProgram>;
accounts: {
/**
* The account that pays for the transaction and bridge account creation.
* The upgrade authority that is authorized to initialize the relayer.
* This ensures only the program deployer can set the initial configuration.
*/
upgradeAuthority: TAccountMetas[0];
/**
* The account that pays for the transaction and config account creation.
* Must be mutable to deduct lamports for account rent.
* Can be different from the upgrade_authority.
*/
payer: TAccountMetas[0];
payer: TAccountMetas[1];
/**
* The relayer config state account that tracks fee parameters.
* - Uses PDA with CFG_SEED for deterministic address
* - Mutable to update EIP1559 fee data
* - Payer funds the account creation
* - Space allocated for config state (DISCRIMINATOR_LEN + Cfg::INIT_SPACE)
*/
cfg: TAccountMetas[2];
/**
* Program data account containing the upgrade authority.
* Validates that the signer is indeed the upgrade authority.
*/
cfg: TAccountMetas[1];
programData: TAccountMetas[3];
/**
* The guardian account that will have administrative authority over the bridge.
* Must be a signer to prove ownership of the guardian key. The payer and guardian
* may be distinct signers.
* The base_relayer program itself.
* Validates that program_data is the correct ProgramData account for this program.
*/
guardian: TAccountMetas[2];
program: TAccountMetas[4];
/**
* System program required for creating new accounts.
* Used internally by Anchor for account initialization.
*/
systemProgram: TAccountMetas[3];
systemProgram: TAccountMetas[5];
};
data: InitializeInstructionData;
};
Expand All @@ -266,7 +313,7 @@ export function parseInitializeInstruction<
InstructionWithAccounts<TAccountMetas> &
InstructionWithData<ReadonlyUint8Array>
): ParsedInitializeInstruction<TProgram, TAccountMetas> {
if (instruction.accounts.length < 4) {
if (instruction.accounts.length < 6) {
// TODO: Coded error.
throw new Error('Not enough accounts');
}
Expand All @@ -279,9 +326,11 @@ export function parseInitializeInstruction<
return {
programAddress: instruction.programAddress,
accounts: {
upgradeAuthority: getNextAccount(),
payer: getNextAccount(),
cfg: getNextAccount(),
guardian: getNextAccount(),
programData: getNextAccount(),
program: getNextAccount(),
systemProgram: getNextAccount(),
},
data: getInitializeInstructionDataDecoder().decode(instruction.data),
Expand Down
Loading
Loading