Fix conflict

solana-program · Nov 14, 2024 · e2eefdd · e2eefdd
1 parent 8b3c079
commit e2eefdd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/clients/js/src/generated/programs/token2022.ts b/clients/js/src/generated/programs/token2022.ts
@@ -181,13 +181,13 @@ export enum Token2022Instruction {
   InitializePermanentDelegate,
   InitializeTransferHook,
   UpdateTransferHook,
-  WithdrawExcessLamports,
   InitializeConfidentialTransferFee,
   WithdrawWithheldTokensFromMintForConfidentialTransferFee,
   WithdrawWithheldTokensFromAccountsForConfidentialTransferFee,
   HarvestWithheldTokensToMintForConfidentialTransferFee,
   EnableHarvestToMint,
   DisableHarvestToMint,
+  WithdrawExcessLamports,
   InitializeMetadataPointer,
   UpdateMetadataPointer,
   InitializeGroupPointer,
@@ -467,9 +467,6 @@ export function identifyToken2022Instruction(
   ) {
     return Token2022Instruction.UpdateTransferHook;
   }
-  if (containsBytes(data, getU8Encoder().encode(38), 0)) {
-    return Token2022Instruction.WithdrawExcessLamports;
-  }
   if (
     containsBytes(data, getU8Encoder().encode(37), 0) &&
     containsBytes(data, getU8Encoder().encode(0), 1)
@@ -506,6 +503,9 @@ export function identifyToken2022Instruction(
   ) {
     return Token2022Instruction.DisableHarvestToMint;
   }
+  if (containsBytes(data, getU8Encoder().encode(38), 0)) {
+    return Token2022Instruction.WithdrawExcessLamports;
+  }
   if (
     containsBytes(data, getU8Encoder().encode(39), 0) &&
     containsBytes(data, getU8Encoder().encode(0), 1)
@@ -798,8 +798,6 @@ export type ParsedToken2022Instruction<
       instructionType: Token2022Instruction.UpdateTransferHook;
     } & ParsedUpdateTransferHookInstruction<TProgram>)
   | ({
-      instructionType: Token2022Instruction.WithdrawExcessLamports;
-    } & ParsedWithdrawExcessLamportsInstruction<TProgram>)
       instructionType: Token2022Instruction.InitializeConfidentialTransferFee;
     } & ParsedInitializeConfidentialTransferFeeInstruction<TProgram>)
   | ({
@@ -817,6 +815,9 @@ export type ParsedToken2022Instruction<
   | ({
       instructionType: Token2022Instruction.DisableHarvestToMint;
     } & ParsedDisableHarvestToMintInstruction<TProgram>)
+  | ({
+      instructionType: Token2022Instruction.WithdrawExcessLamports;
+    } & ParsedWithdrawExcessLamportsInstruction<TProgram>)
   | ({
       instructionType: Token2022Instruction.InitializeMetadataPointer;
     } & ParsedInitializeMetadataPointerInstruction<TProgram>)