okay to review

jito-foundation · Nov 8, 2024 · f307d69 · f307d69
1 parent f75b100
commit f307d69
Show file tree

Hide file tree

Showing 16 changed files with 204 additions and 73 deletions.
diff --git a/clients/js/jito_tip_router/instructions/adminUpdateWeightTable.ts b/clients/js/jito_tip_router/instructions/adminUpdateWeightTable.ts
@@ -45,6 +45,7 @@ export type AdminUpdateWeightTableInstruction<
   TAccountNcn extends string | IAccountMeta<string> = string,
   TAccountWeightTable extends string | IAccountMeta<string> = string,
   TAccountWeightTableAdmin extends string | IAccountMeta<string> = string,
+  TAccountMint extends string | IAccountMeta<string> = string,
   TAccountRestakingProgramId extends string | IAccountMeta<string> = string,
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
@@ -59,6 +60,9 @@ export type AdminUpdateWeightTableInstruction<
         ? ReadonlySignerAccount<TAccountWeightTableAdmin> &
             IAccountSignerMeta<TAccountWeightTableAdmin>
         : TAccountWeightTableAdmin,
+      TAccountMint extends string
+        ? ReadonlyAccount<TAccountMint>
+        : TAccountMint,
       TAccountRestakingProgramId extends string
         ? ReadonlyAccount<TAccountRestakingProgramId>
         : TAccountRestakingProgramId,
@@ -113,11 +117,13 @@ export type AdminUpdateWeightTableInput<
   TAccountNcn extends string = string,
   TAccountWeightTable extends string = string,
   TAccountWeightTableAdmin extends string = string,
+  TAccountMint extends string = string,
   TAccountRestakingProgramId extends string = string,
 > = {
   ncn: Address<TAccountNcn>;
   weightTable: Address<TAccountWeightTable>;
   weightTableAdmin: TransactionSigner<TAccountWeightTableAdmin>;
+  mint: Address<TAccountMint>;
   restakingProgramId: Address<TAccountRestakingProgramId>;
   ncnEpoch: AdminUpdateWeightTableInstructionDataArgs['ncnEpoch'];
   weight: AdminUpdateWeightTableInstructionDataArgs['weight'];
@@ -127,13 +133,15 @@ export function getAdminUpdateWeightTableInstruction<
   TAccountNcn extends string,
   TAccountWeightTable extends string,
   TAccountWeightTableAdmin extends string,
+  TAccountMint extends string,
   TAccountRestakingProgramId extends string,
   TProgramAddress extends Address = typeof JITO_TIP_ROUTER_PROGRAM_ADDRESS,
 >(
   input: AdminUpdateWeightTableInput<
     TAccountNcn,
     TAccountWeightTable,
     TAccountWeightTableAdmin,
+    TAccountMint,
     TAccountRestakingProgramId
   >,
   config?: { programAddress?: TProgramAddress }
@@ -142,6 +150,7 @@ export function getAdminUpdateWeightTableInstruction<
   TAccountNcn,
   TAccountWeightTable,
   TAccountWeightTableAdmin,
+  TAccountMint,
   TAccountRestakingProgramId
 > {
   // Program address.
@@ -156,6 +165,7 @@ export function getAdminUpdateWeightTableInstruction<
       value: input.weightTableAdmin ?? null,
       isWritable: false,
     },
+    mint: { value: input.mint ?? null, isWritable: false },
     restakingProgramId: {
       value: input.restakingProgramId ?? null,
       isWritable: false,
@@ -175,6 +185,7 @@ export function getAdminUpdateWeightTableInstruction<
       getAccountMeta(accounts.ncn),
       getAccountMeta(accounts.weightTable),
       getAccountMeta(accounts.weightTableAdmin),
+      getAccountMeta(accounts.mint),
       getAccountMeta(accounts.restakingProgramId),
     ],
     programAddress,
@@ -186,6 +197,7 @@ export function getAdminUpdateWeightTableInstruction<
     TAccountNcn,
     TAccountWeightTable,
     TAccountWeightTableAdmin,
+    TAccountMint,
     TAccountRestakingProgramId
   >;
 
@@ -201,7 +213,8 @@ export type ParsedAdminUpdateWeightTableInstruction<
     ncn: TAccountMetas[0];
     weightTable: TAccountMetas[1];
     weightTableAdmin: TAccountMetas[2];
-    restakingProgramId: TAccountMetas[3];
+    mint: TAccountMetas[3];
+    restakingProgramId: TAccountMetas[4];
   };
   data: AdminUpdateWeightTableInstructionData;
 };
@@ -214,7 +227,7 @@ export function parseAdminUpdateWeightTableInstruction<
     IInstructionWithAccounts<TAccountMetas> &
     IInstructionWithData<Uint8Array>
 ): ParsedAdminUpdateWeightTableInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 4) {
+  if (instruction.accounts.length < 5) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -230,6 +243,7 @@ export function parseAdminUpdateWeightTableInstruction<
       ncn: getNextAccount(),
       weightTable: getNextAccount(),
       weightTableAdmin: getNextAccount(),
+      mint: getNextAccount(),
       restakingProgramId: getNextAccount(),
     },
     data: getAdminUpdateWeightTableInstructionDataDecoder().decode(

diff --git a/clients/js/jito_tip_router/instructions/initializeNCNConfig.ts b/clients/js/jito_tip_router/instructions/initializeNCNConfig.ts
@@ -41,7 +41,7 @@ export function getInitializeNCNConfigDiscriminatorBytes() {
 export type InitializeNCNConfigInstruction<
   TProgram extends string = typeof JITO_TIP_ROUTER_PROGRAM_ADDRESS,
   TAccountRestakingConfig extends string | IAccountMeta<string> = string,
-  TAccountConfig extends string | IAccountMeta<string> = string,
+  TAccountNcnConfig extends string | IAccountMeta<string> = string,
   TAccountNcn extends string | IAccountMeta<string> = string,
   TAccountNcnAdmin extends string | IAccountMeta<string> = string,
   TAccountFeeWallet extends string | IAccountMeta<string> = string,
@@ -58,9 +58,9 @@ export type InitializeNCNConfigInstruction<
       TAccountRestakingConfig extends string
         ? ReadonlyAccount<TAccountRestakingConfig>
         : TAccountRestakingConfig,
-      TAccountConfig extends string
-        ? WritableAccount<TAccountConfig>
-        : TAccountConfig,
+      TAccountNcnConfig extends string
+        ? WritableAccount<TAccountNcnConfig>
+        : TAccountNcnConfig,
       TAccountNcn extends string ? ReadonlyAccount<TAccountNcn> : TAccountNcn,
       TAccountNcnAdmin extends string
         ? ReadonlySignerAccount<TAccountNcnAdmin> &
@@ -131,7 +131,7 @@ export function getInitializeNCNConfigInstructionDataCodec(): Codec<
 
 export type InitializeNCNConfigInput<
   TAccountRestakingConfig extends string = string,
-  TAccountConfig extends string = string,
+  TAccountNcnConfig extends string = string,
   TAccountNcn extends string = string,
   TAccountNcnAdmin extends string = string,
   TAccountFeeWallet extends string = string,
@@ -140,7 +140,7 @@ export type InitializeNCNConfigInput<
   TAccountSystemProgram extends string = string,
 > = {
   restakingConfig: Address<TAccountRestakingConfig>;
-  config: Address<TAccountConfig>;
+  ncnConfig: Address<TAccountNcnConfig>;
   ncn: Address<TAccountNcn>;
   ncnAdmin: TransactionSigner<TAccountNcnAdmin>;
   feeWallet: Address<TAccountFeeWallet>;
@@ -154,7 +154,7 @@ export type InitializeNCNConfigInput<
 
 export function getInitializeNCNConfigInstruction<
   TAccountRestakingConfig extends string,
-  TAccountConfig extends string,
+  TAccountNcnConfig extends string,
   TAccountNcn extends string,
   TAccountNcnAdmin extends string,
   TAccountFeeWallet extends string,
@@ -165,7 +165,7 @@ export function getInitializeNCNConfigInstruction<
 >(
   input: InitializeNCNConfigInput<
     TAccountRestakingConfig,
-    TAccountConfig,
+    TAccountNcnConfig,
     TAccountNcn,
     TAccountNcnAdmin,
     TAccountFeeWallet,
@@ -177,7 +177,7 @@ export function getInitializeNCNConfigInstruction<
 ): InitializeNCNConfigInstruction<
   TProgramAddress,
   TAccountRestakingConfig,
-  TAccountConfig,
+  TAccountNcnConfig,
   TAccountNcn,
   TAccountNcnAdmin,
   TAccountFeeWallet,
@@ -195,7 +195,7 @@ export function getInitializeNCNConfigInstruction<
       value: input.restakingConfig ?? null,
       isWritable: false,
     },
-    config: { value: input.config ?? null, isWritable: true },
+    ncnConfig: { value: input.ncnConfig ?? null, isWritable: true },
     ncn: { value: input.ncn ?? null, isWritable: false },
     ncnAdmin: { value: input.ncnAdmin ?? null, isWritable: false },
     feeWallet: { value: input.feeWallet ?? null, isWritable: false },
@@ -227,7 +227,7 @@ export function getInitializeNCNConfigInstruction<
   const instruction = {
     accounts: [
       getAccountMeta(accounts.restakingConfig),
-      getAccountMeta(accounts.config),
+      getAccountMeta(accounts.ncnConfig),
       getAccountMeta(accounts.ncn),
       getAccountMeta(accounts.ncnAdmin),
       getAccountMeta(accounts.feeWallet),
@@ -242,7 +242,7 @@ export function getInitializeNCNConfigInstruction<
   } as InitializeNCNConfigInstruction<
     TProgramAddress,
     TAccountRestakingConfig,
-    TAccountConfig,
+    TAccountNcnConfig,
     TAccountNcn,
     TAccountNcnAdmin,
     TAccountFeeWallet,
@@ -261,7 +261,7 @@ export type ParsedInitializeNCNConfigInstruction<
   programAddress: Address<TProgram>;
   accounts: {
     restakingConfig: TAccountMetas[0];
-    config: TAccountMetas[1];
+    ncnConfig: TAccountMetas[1];
     ncn: TAccountMetas[2];
     ncnAdmin: TAccountMetas[3];
     feeWallet: TAccountMetas[4];
@@ -294,7 +294,7 @@ export function parseInitializeNCNConfigInstruction<
     programAddress: instruction.programAddress,
     accounts: {
       restakingConfig: getNextAccount(),
-      config: getNextAccount(),
+      ncnConfig: getNextAccount(),
       ncn: getNextAccount(),
       ncnAdmin: getNextAccount(),
       feeWallet: getNextAccount(),

diff --git a/clients/js/jito_tip_router/instructions/initializeWeightTable.ts b/clients/js/jito_tip_router/instructions/initializeWeightTable.ts
@@ -30,6 +30,7 @@ import {
   type OptionOrNullable,
   type ReadonlyAccount,
   type TransactionSigner,
+  type WritableAccount,
   type WritableSignerAccount,
 } from '@solana/web3.js';
 import { JITO_TIP_ROUTER_PROGRAM_ADDRESS } from '../programs';
@@ -65,8 +66,7 @@ export type InitializeWeightTableInstruction<
         : TAccountNcnConfig,
       TAccountNcn extends string ? ReadonlyAccount<TAccountNcn> : TAccountNcn,
       TAccountWeightTable extends string
-        ? WritableSignerAccount<TAccountWeightTable> &
-            IAccountSignerMeta<TAccountWeightTable>
+        ? WritableAccount<TAccountWeightTable>
         : TAccountWeightTable,
       TAccountPayer extends string
         ? WritableSignerAccount<TAccountPayer> &
@@ -133,7 +133,7 @@ export type InitializeWeightTableInput<
   restakingConfig: Address<TAccountRestakingConfig>;
   ncnConfig: Address<TAccountNcnConfig>;
   ncn: Address<TAccountNcn>;
-  weightTable: TransactionSigner<TAccountWeightTable>;
+  weightTable: Address<TAccountWeightTable>;
   payer: TransactionSigner<TAccountPayer>;
   restakingProgramId: Address<TAccountRestakingProgramId>;
   systemProgram?: Address<TAccountSystemProgram>;