[Don't merge]: force overwrite program fee wallet

cli/src/vault.rs

@@ -29,6 +29,8 @@ pub enum ConfigActions {
         /// The new admin's pubkey
         new_admin: Pubkey,
     },
+    /// Set the config program fee wallet
+    SetProgramFeeWallet,
 }
 
 /// Vault commands

cli/src/vault_handler.rs

@@ -9,7 +9,8 @@ use jito_vault_client::{
         CooldownDelegationBuilder, CrankVaultUpdateStateTrackerBuilder, CreateTokenMetadataBuilder,
         EnqueueWithdrawalBuilder, InitializeConfigBuilder, InitializeVaultBuilder,
         InitializeVaultOperatorDelegationBuilder, InitializeVaultUpdateStateTrackerBuilder,
-        MintToBuilder, SetConfigAdminBuilder, SetDepositCapacityBuilder,
+        MintToBuilder, SetConfigAdminBuilder, SetConfigProgramFeeWalletBuilder,
+        SetDepositCapacityBuilder,
     },
     types::WithdrawalAllocationMethod,
 };
@@ -81,6 +82,9 @@ impl VaultCliHandler {
             VaultCommands::Config {
                 action: ConfigActions::SetAdmin { new_admin },
             } => self.set_config_admin(new_admin).await,
+            VaultCommands::Config {
+                action: ConfigActions::SetProgramFeeWallet,
+            } => self.set_config_program_fee_wallet().await,
             VaultCommands::Vault {
                 action:
                     VaultActions::Initialize {
@@ -1117,4 +1121,33 @@ impl VaultCliHandler {
         info!("Transaction confirmed: {:?}", tx.get_signature());
         Ok(())
     }
+
+    async fn set_config_program_fee_wallet(&self) -> Result<()> {
+        let keypair = self
+            .cli_config
+            .keypair
+            .as_ref()
+            .ok_or_else(|| anyhow!("Keypair not provided"))?;
+        let rpc_client = self.get_rpc_client();
+
+        let config_address = Config::find_program_address(&self.vault_program_id).0;
+        let mut ix_builder = SetConfigProgramFeeWalletBuilder::new();
+        ix_builder.config(config_address);
+
+        let blockhash = rpc_client.get_latest_blockhash().await?;
+        let tx = Transaction::new_signed_with_payer(
+            &[ix_builder.instruction()],
+            Some(&keypair.pubkey()),
+            &[keypair],
+            blockhash,
+        );
+
+        info!(
+            "Setting config program fee wallet transaction: {:?}",
+            tx.get_signature()
+        );
+        rpc_client.send_and_confirm_transaction(&tx).await?;
+        info!("Transaction confirmed: {:?}", tx.get_signature());
+        Ok(())
+    }
 }

clients/js/vault_client/instructions/index.ts

@@ -28,6 +28,7 @@ export * from './initializeVaultWithMint';
 export * from './mintTo';
 export * from './setAdmin';
 export * from './setConfigAdmin';
+export * from './setConfigProgramFeeWallet';
 export * from './setDepositCapacity';
 export * from './setFees';
 export * from './setIsPaused';

clients/js/vault_client/instructions/setConfigProgramFeeWallet.ts

@@ -0,0 +1,157 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/kinobi-so/kinobi
+ */
+
+import {
+  combineCodec,
+  getStructDecoder,
+  getStructEncoder,
+  getU8Decoder,
+  getU8Encoder,
+  transformEncoder,
+  type Address,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type WritableAccount,
+} from '@solana/web3.js';
+import { JITO_VAULT_PROGRAM_ADDRESS } from '../programs';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
+
+export const SET_CONFIG_PROGRAM_FEE_WALLET_DISCRIMINATOR = 32;
+
+export function getSetConfigProgramFeeWalletDiscriminatorBytes() {
+  return getU8Encoder().encode(SET_CONFIG_PROGRAM_FEE_WALLET_DISCRIMINATOR);
+}
+
+export type SetConfigProgramFeeWalletInstruction<
+  TProgram extends string = typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountConfig extends string | IAccountMeta<string> = string,
+  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
+> = IInstruction<TProgram> &
+  IInstructionWithData<Uint8Array> &
+  IInstructionWithAccounts<
+    [
+      TAccountConfig extends string
+        ? WritableAccount<TAccountConfig>
+        : TAccountConfig,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type SetConfigProgramFeeWalletInstructionData = {
+  discriminator: number;
+};
+
+export type SetConfigProgramFeeWalletInstructionDataArgs = {};
+
+export function getSetConfigProgramFeeWalletInstructionDataEncoder(): Encoder<SetConfigProgramFeeWalletInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', getU8Encoder()]]),
+    (value) => ({
+      ...value,
+      discriminator: SET_CONFIG_PROGRAM_FEE_WALLET_DISCRIMINATOR,
+    })
+  );
+}
+
+export function getSetConfigProgramFeeWalletInstructionDataDecoder(): Decoder<SetConfigProgramFeeWalletInstructionData> {
+  return getStructDecoder([['discriminator', getU8Decoder()]]);
+}
+
+export function getSetConfigProgramFeeWalletInstructionDataCodec(): Codec<
+  SetConfigProgramFeeWalletInstructionDataArgs,
+  SetConfigProgramFeeWalletInstructionData
+> {
+  return combineCodec(
+    getSetConfigProgramFeeWalletInstructionDataEncoder(),
+    getSetConfigProgramFeeWalletInstructionDataDecoder()
+  );
+}
+
+export type SetConfigProgramFeeWalletInput<
+  TAccountConfig extends string = string,
+> = {
+  config: Address<TAccountConfig>;
+};
+
+export function getSetConfigProgramFeeWalletInstruction<
+  TAccountConfig extends string,
+>(
+  input: SetConfigProgramFeeWalletInput<TAccountConfig>
+): SetConfigProgramFeeWalletInstruction<
+  typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountConfig
+> {
+  // Program address.
+  const programAddress = JITO_VAULT_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    config: { value: input.config ?? null, isWritable: true },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [getAccountMeta(accounts.config)],
+    programAddress,
+    data: getSetConfigProgramFeeWalletInstructionDataEncoder().encode({}),
+  } as SetConfigProgramFeeWalletInstruction<
+    typeof JITO_VAULT_PROGRAM_ADDRESS,
+    TAccountConfig
+  >;
+
+  return instruction;
+}
+
+export type ParsedSetConfigProgramFeeWalletInstruction<
+  TProgram extends string = typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    config: TAccountMetas[0];
+  };
+  data: SetConfigProgramFeeWalletInstructionData;
+};
+
+export function parseSetConfigProgramFeeWalletInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly IAccountMeta[],
+>(
+  instruction: IInstruction<TProgram> &
+    IInstructionWithAccounts<TAccountMetas> &
+    IInstructionWithData<Uint8Array>
+): ParsedSetConfigProgramFeeWalletInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 1) {
+    // TODO: Coded error.
+    throw new Error('Not enough accounts');
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = instruction.accounts![accountIndex]!;
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      config: getNextAccount(),
+    },
+    data: getSetConfigProgramFeeWalletInstructionDataDecoder().decode(
+      instruction.data
+    ),
+  };
+}

clients/js/vault_client/programs/jitoVault.ts

@@ -35,6 +35,7 @@ import {
   type ParsedMintToInstruction,
   type ParsedSetAdminInstruction,
   type ParsedSetConfigAdminInstruction,
+  type ParsedSetConfigProgramFeeWalletInstruction,
   type ParsedSetDepositCapacityInstruction,
   type ParsedSetFeesInstruction,
   type ParsedSetIsPausedInstruction,
@@ -94,6 +95,7 @@ export enum JitoVaultInstruction {
   CreateTokenMetadata,
   UpdateTokenMetadata,
   SetConfigAdmin,
+  SetConfigProgramFeeWallet,
 }
 
 export function identifyJitoVaultInstruction(
@@ -196,6 +198,9 @@ export function identifyJitoVaultInstruction(
   if (containsBytes(data, getU8Encoder().encode(31), 0)) {
     return JitoVaultInstruction.SetConfigAdmin;
   }
+  if (containsBytes(data, getU8Encoder().encode(32), 0)) {
+    return JitoVaultInstruction.SetConfigProgramFeeWallet;
+  }
   throw new Error(
     'The provided instruction could not be identified as a jitoVault instruction.'
   );
@@ -299,4 +304,7 @@ export type ParsedJitoVaultInstruction<
     } & ParsedUpdateTokenMetadataInstruction<TProgram>)
   | ({
       instructionType: JitoVaultInstruction.SetConfigAdmin;
-    } & ParsedSetConfigAdminInstruction<TProgram>);
+    } & ParsedSetConfigAdminInstruction<TProgram>)
+  | ({
+      instructionType: JitoVaultInstruction.SetConfigProgramFeeWallet;
+    } & ParsedSetConfigProgramFeeWalletInstruction<TProgram>);

clients/rust/vault_client/src/generated/instructions/mod.rs

@@ -26,6 +26,7 @@ pub(crate) mod r#initialize_vault_with_mint;
 pub(crate) mod r#mint_to;
 pub(crate) mod r#set_admin;
 pub(crate) mod r#set_config_admin;
+pub(crate) mod r#set_config_program_fee_wallet;
 pub(crate) mod r#set_deposit_capacity;
 pub(crate) mod r#set_fees;
 pub(crate) mod r#set_is_paused;
@@ -46,8 +47,8 @@ pub use self::{
     r#initialize_vault_ncn_slasher_operator_ticket::*, r#initialize_vault_ncn_slasher_ticket::*,
     r#initialize_vault_ncn_ticket::*, r#initialize_vault_operator_delegation::*,
     r#initialize_vault_update_state_tracker::*, r#initialize_vault_with_mint::*, r#mint_to::*,
-    r#set_admin::*, r#set_config_admin::*, r#set_deposit_capacity::*, r#set_fees::*,
-    r#set_is_paused::*, r#set_program_fee::*, r#set_program_fee_wallet::*,
-    r#set_secondary_admin::*, r#update_token_metadata::*, r#update_vault_balance::*,
-    r#warmup_vault_ncn_slasher_ticket::*, r#warmup_vault_ncn_ticket::*,
+    r#set_admin::*, r#set_config_admin::*, r#set_config_program_fee_wallet::*,
+    r#set_deposit_capacity::*, r#set_fees::*, r#set_is_paused::*, r#set_program_fee::*,
+    r#set_program_fee_wallet::*, r#set_secondary_admin::*, r#update_token_metadata::*,
+    r#update_vault_balance::*, r#warmup_vault_ncn_slasher_ticket::*, r#warmup_vault_ncn_ticket::*,
 };