AUDIT: 36675

clients/js/vault_client/instructions/index.ts

@@ -26,6 +26,7 @@ export * from './initializeVaultOperatorDelegation';
 export * from './initializeVaultUpdateStateTracker';
 export * from './initializeVaultWithMint';
 export * from './mintTo';
+export * from './revokeDelegateTokenAccount';
 export * from './setAdmin';
 export * from './setConfigAdmin';
 export * from './setDepositCapacity';

clients/js/vault_client/instructions/revokeDelegateTokenAccount.ts

@@ -0,0 +1,247 @@
+/**
+ * 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 IAccountSignerMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type TransactionSigner,
+  type WritableAccount,
+} from '@solana/web3.js';
+import { JITO_VAULT_PROGRAM_ADDRESS } from '../programs';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
+
+export const REVOKE_DELEGATE_TOKEN_ACCOUNT_DISCRIMINATOR = 32;
+
+export function getRevokeDelegateTokenAccountDiscriminatorBytes() {
+  return getU8Encoder().encode(REVOKE_DELEGATE_TOKEN_ACCOUNT_DISCRIMINATOR);
+}
+
+export type RevokeDelegateTokenAccountInstruction<
+  TProgram extends string = typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountConfig extends string | IAccountMeta<string> = string,
+  TAccountVault extends string | IAccountMeta<string> = string,
+  TAccountDelegateAssetAdmin extends string | IAccountMeta<string> = string,
+  TAccountTokenMint extends string | IAccountMeta<string> = string,
+  TAccountTokenAccount extends string | IAccountMeta<string> = string,
+  TAccountTokenProgram extends
+    | string
+    | IAccountMeta<string> = 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA',
+  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
+> = IInstruction<TProgram> &
+  IInstructionWithData<Uint8Array> &
+  IInstructionWithAccounts<
+    [
+      TAccountConfig extends string
+        ? ReadonlyAccount<TAccountConfig>
+        : TAccountConfig,
+      TAccountVault extends string
+        ? ReadonlyAccount<TAccountVault>
+        : TAccountVault,
+      TAccountDelegateAssetAdmin extends string
+        ? ReadonlySignerAccount<TAccountDelegateAssetAdmin> &
+            IAccountSignerMeta<TAccountDelegateAssetAdmin>
+        : TAccountDelegateAssetAdmin,
+      TAccountTokenMint extends string
+        ? ReadonlyAccount<TAccountTokenMint>
+        : TAccountTokenMint,
+      TAccountTokenAccount extends string
+        ? WritableAccount<TAccountTokenAccount>
+        : TAccountTokenAccount,
+      TAccountTokenProgram extends string
+        ? ReadonlyAccount<TAccountTokenProgram>
+        : TAccountTokenProgram,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type RevokeDelegateTokenAccountInstructionData = {
+  discriminator: number;
+};
+
+export type RevokeDelegateTokenAccountInstructionDataArgs = {};
+
+export function getRevokeDelegateTokenAccountInstructionDataEncoder(): Encoder<RevokeDelegateTokenAccountInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', getU8Encoder()]]),
+    (value) => ({
+      ...value,
+      discriminator: REVOKE_DELEGATE_TOKEN_ACCOUNT_DISCRIMINATOR,
+    })
+  );
+}
+
+export function getRevokeDelegateTokenAccountInstructionDataDecoder(): Decoder<RevokeDelegateTokenAccountInstructionData> {
+  return getStructDecoder([['discriminator', getU8Decoder()]]);
+}
+
+export function getRevokeDelegateTokenAccountInstructionDataCodec(): Codec<
+  RevokeDelegateTokenAccountInstructionDataArgs,
+  RevokeDelegateTokenAccountInstructionData
+> {
+  return combineCodec(
+    getRevokeDelegateTokenAccountInstructionDataEncoder(),
+    getRevokeDelegateTokenAccountInstructionDataDecoder()
+  );
+}
+
+export type RevokeDelegateTokenAccountInput<
+  TAccountConfig extends string = string,
+  TAccountVault extends string = string,
+  TAccountDelegateAssetAdmin extends string = string,
+  TAccountTokenMint extends string = string,
+  TAccountTokenAccount extends string = string,
+  TAccountTokenProgram extends string = string,
+> = {
+  config: Address<TAccountConfig>;
+  vault: Address<TAccountVault>;
+  delegateAssetAdmin: TransactionSigner<TAccountDelegateAssetAdmin>;
+  tokenMint: Address<TAccountTokenMint>;
+  tokenAccount: Address<TAccountTokenAccount>;
+  tokenProgram?: Address<TAccountTokenProgram>;
+};
+
+export function getRevokeDelegateTokenAccountInstruction<
+  TAccountConfig extends string,
+  TAccountVault extends string,
+  TAccountDelegateAssetAdmin extends string,
+  TAccountTokenMint extends string,
+  TAccountTokenAccount extends string,
+  TAccountTokenProgram extends string,
+>(
+  input: RevokeDelegateTokenAccountInput<
+    TAccountConfig,
+    TAccountVault,
+    TAccountDelegateAssetAdmin,
+    TAccountTokenMint,
+    TAccountTokenAccount,
+    TAccountTokenProgram
+  >
+): RevokeDelegateTokenAccountInstruction<
+  typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountConfig,
+  TAccountVault,
+  TAccountDelegateAssetAdmin,
+  TAccountTokenMint,
+  TAccountTokenAccount,
+  TAccountTokenProgram
+> {
+  // Program address.
+  const programAddress = JITO_VAULT_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    config: { value: input.config ?? null, isWritable: false },
+    vault: { value: input.vault ?? null, isWritable: false },
+    delegateAssetAdmin: {
+      value: input.delegateAssetAdmin ?? null,
+      isWritable: false,
+    },
+    tokenMint: { value: input.tokenMint ?? null, isWritable: false },
+    tokenAccount: { value: input.tokenAccount ?? null, isWritable: true },
+    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  // Resolve default values.
+  if (!accounts.tokenProgram.value) {
+    accounts.tokenProgram.value =
+      'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA' as Address<'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'>;
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [
+      getAccountMeta(accounts.config),
+      getAccountMeta(accounts.vault),
+      getAccountMeta(accounts.delegateAssetAdmin),
+      getAccountMeta(accounts.tokenMint),
+      getAccountMeta(accounts.tokenAccount),
+      getAccountMeta(accounts.tokenProgram),
+    ],
+    programAddress,
+    data: getRevokeDelegateTokenAccountInstructionDataEncoder().encode({}),
+  } as RevokeDelegateTokenAccountInstruction<
+    typeof JITO_VAULT_PROGRAM_ADDRESS,
+    TAccountConfig,
+    TAccountVault,
+    TAccountDelegateAssetAdmin,
+    TAccountTokenMint,
+    TAccountTokenAccount,
+    TAccountTokenProgram
+  >;
+
+  return instruction;
+}
+
+export type ParsedRevokeDelegateTokenAccountInstruction<
+  TProgram extends string = typeof JITO_VAULT_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    config: TAccountMetas[0];
+    vault: TAccountMetas[1];
+    delegateAssetAdmin: TAccountMetas[2];
+    tokenMint: TAccountMetas[3];
+    tokenAccount: TAccountMetas[4];
+    tokenProgram: TAccountMetas[5];
+  };
+  data: RevokeDelegateTokenAccountInstructionData;
+};
+
+export function parseRevokeDelegateTokenAccountInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly IAccountMeta[],
+>(
+  instruction: IInstruction<TProgram> &
+    IInstructionWithAccounts<TAccountMetas> &
+    IInstructionWithData<Uint8Array>
+): ParsedRevokeDelegateTokenAccountInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 6) {
+    // 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(),
+      vault: getNextAccount(),
+      delegateAssetAdmin: getNextAccount(),
+      tokenMint: getNextAccount(),
+      tokenAccount: getNextAccount(),
+      tokenProgram: getNextAccount(),
+    },
+    data: getRevokeDelegateTokenAccountInstructionDataDecoder().decode(
+      instruction.data
+    ),
+  };
+}

clients/js/vault_client/programs/jitoVault.ts

@@ -33,6 +33,7 @@ import {
   type ParsedInitializeVaultUpdateStateTrackerInstruction,
   type ParsedInitializeVaultWithMintInstruction,
   type ParsedMintToInstruction,
+  type ParsedRevokeDelegateTokenAccountInstruction,
   type ParsedSetAdminInstruction,
   type ParsedSetConfigAdminInstruction,
   type ParsedSetDepositCapacityInstruction,
@@ -94,6 +95,7 @@ export enum JitoVaultInstruction {
   CreateTokenMetadata,
   UpdateTokenMetadata,
   SetConfigAdmin,
+  RevokeDelegateTokenAccount,
 }
 
 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.RevokeDelegateTokenAccount;
+  }
   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.RevokeDelegateTokenAccount;
+    } & ParsedRevokeDelegateTokenAccountInstruction<TProgram>);

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

@@ -24,6 +24,7 @@ pub(crate) mod r#initialize_vault_operator_delegation;
 pub(crate) mod r#initialize_vault_update_state_tracker;
 pub(crate) mod r#initialize_vault_with_mint;
 pub(crate) mod r#mint_to;
+pub(crate) mod r#revoke_delegate_token_account;
 pub(crate) mod r#set_admin;
 pub(crate) mod r#set_config_admin;
 pub(crate) mod r#set_deposit_capacity;
@@ -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#revoke_delegate_token_account::*, 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::*,
 };