@shogun-sdk/intents-sdk 1.3.0 → 1.4.0

package/src/core/solana/generated/single-chain/errors/singleChainGuard.ts

@@ -21,46 +21,48 @@ export const SINGLE_CHAIN_GUARD_ERROR__NOT_PENDING_ADMIN = 0x1772; // 6002
 export const SINGLE_CHAIN_GUARD_ERROR__NOT_A_SOLVER = 0x1773; // 6003
 /** NotAUser: Account is not a User */
 export const SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER = 0x1774; // 6004
+/** NotAUserOrCancelAuthority: Account is not a User or Cancel authority */
+export const SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER_OR_CANCEL_AUTHORITY = 0x1775; // 6005
 /** ZeroAmount: Amount must not be zero */
-export const SINGLE_CHAIN_GUARD_ERROR__ZERO_AMOUNT = 0x1775; // 6005
+export const SINGLE_CHAIN_GUARD_ERROR__ZERO_AMOUNT = 0x1776; // 6006
 /** ZeroAmountIn: Amount IN must not be zero */
-export const SINGLE_CHAIN_GUARD_ERROR__ZERO_AMOUNT_IN = 0x1776; // 6006
+export const SINGLE_CHAIN_GUARD_ERROR__ZERO_AMOUNT_IN = 0x1777; // 6007
 /** WrongOrder: Wrong order */
-export const SINGLE_CHAIN_GUARD_ERROR__WRONG_ORDER = 0x1777; // 6007
+export const SINGLE_CHAIN_GUARD_ERROR__WRONG_ORDER = 0x1778; // 6008
 /** InvalidGuard: Invalid Guard */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_GUARD = 0x1778; // 6008
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_GUARD = 0x1779; // 6009
 /** ExpiredDeadline: Expired deadline */
-export const SINGLE_CHAIN_GUARD_ERROR__EXPIRED_DEADLINE = 0x1779; // 6009
+export const SINGLE_CHAIN_GUARD_ERROR__EXPIRED_DEADLINE = 0x177a; // 6010
 /** InvalidStartPermission: Invalid permission */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_START_PERMISSION = 0x177a; // 6010
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_START_PERMISSION = 0x177b; // 6011
 /** SystemProgramNotProvided: System program not provided */
-export const SINGLE_CHAIN_GUARD_ERROR__SYSTEM_PROGRAM_NOT_PROVIDED = 0x177b; // 6011
+export const SINGLE_CHAIN_GUARD_ERROR__SYSTEM_PROGRAM_NOT_PROVIDED = 0x177c; // 6012
 /** TokenOutAccountNotProvided: Token OUT account not provided */
-export const SINGLE_CHAIN_GUARD_ERROR__TOKEN_OUT_ACCOUNT_NOT_PROVIDED = 0x177c; // 6012
+export const SINGLE_CHAIN_GUARD_ERROR__TOKEN_OUT_ACCOUNT_NOT_PROVIDED = 0x177d; // 6013
 /** ExtraTransferAccountNotProvided: Extra transfer account not provided */
-export const SINGLE_CHAIN_GUARD_ERROR__EXTRA_TRANSFER_ACCOUNT_NOT_PROVIDED = 0x177d; // 6013
+export const SINGLE_CHAIN_GUARD_ERROR__EXTRA_TRANSFER_ACCOUNT_NOT_PROVIDED = 0x177e; // 6014
 /** InvalidExtraTransferAccount: Invalid extra transfer account */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_EXTRA_TRANSFER_ACCOUNT = 0x177e; // 6014
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_EXTRA_TRANSFER_ACCOUNT = 0x177f; // 6015
 /** CpiCallNotAllowed: CPI call is not allowed */
-export const SINGLE_CHAIN_GUARD_ERROR__CPI_CALL_NOT_ALLOWED = 0x177f; // 6015
+export const SINGLE_CHAIN_GUARD_ERROR__CPI_CALL_NOT_ALLOWED = 0x1780; // 6016
 /** FeeTransferNotAllowed: Fee transfer not allowed */
-export const SINGLE_CHAIN_GUARD_ERROR__FEE_TRANSFER_NOT_ALLOWED = 0x1780; // 6016
+export const SINGLE_CHAIN_GUARD_ERROR__FEE_TRANSFER_NOT_ALLOWED = 0x1781; // 6017
 /** BelowMinAmountOut: Below minimum amount OUT */
-export const SINGLE_CHAIN_GUARD_ERROR__BELOW_MIN_AMOUNT_OUT = 0x1781; // 6017
+export const SINGLE_CHAIN_GUARD_ERROR__BELOW_MIN_AMOUNT_OUT = 0x1782; // 6018
 /** SecretHashMismatch: Secret hash mismatch */
-export const SINGLE_CHAIN_GUARD_ERROR__SECRET_HASH_MISMATCH = 0x1782; // 6018
+export const SINGLE_CHAIN_GUARD_ERROR__SECRET_HASH_MISMATCH = 0x1783; // 6019
 /** InvalidIntervalDuration: Invalid interval duration */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_INTERVAL_DURATION = 0x1783; // 6019
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_INTERVAL_DURATION = 0x1784; // 6020
 /** InvalidDcaOrder: Invalid DCA order */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_DCA_ORDER = 0x1784; // 6020
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_DCA_ORDER = 0x1785; // 6021
 /** IntervalIsFulfilled: Interval is already fulfilled */
-export const SINGLE_CHAIN_GUARD_ERROR__INTERVAL_IS_FULFILLED = 0x1785; // 6021
+export const SINGLE_CHAIN_GUARD_ERROR__INTERVAL_IS_FULFILLED = 0x1786; // 6022
 /** InstructionNotFound: Ed25519Program instruction */
-export const SINGLE_CHAIN_GUARD_ERROR__INSTRUCTION_NOT_FOUND = 0x1786; // 6022
+export const SINGLE_CHAIN_GUARD_ERROR__INSTRUCTION_NOT_FOUND = 0x1787; // 6023
 /** SigVerificationFailed: Signature verification failed */
-export const SINGLE_CHAIN_GUARD_ERROR__SIG_VERIFICATION_FAILED = 0x1787; // 6023
+export const SINGLE_CHAIN_GUARD_ERROR__SIG_VERIFICATION_FAILED = 0x1788; // 6024
 /** InvalidSigner: Invalid signer */
-export const SINGLE_CHAIN_GUARD_ERROR__INVALID_SIGNER = 0x1788; // 6024
+export const SINGLE_CHAIN_GUARD_ERROR__INVALID_SIGNER = 0x1789; // 6025
 
 export type SingleChainGuardError =
   | typeof SINGLE_CHAIN_GUARD_ERROR__BELOW_MIN_AMOUNT_OUT
@@ -79,6 +81,7 @@ export type SingleChainGuardError =
   | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_ADMIN
   | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_A_SOLVER
   | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER
+  | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER_OR_CANCEL_AUTHORITY
   | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_PENDING_ADMIN
   | typeof SINGLE_CHAIN_GUARD_ERROR__NOT_UPGRADE_AUTHORITY
   | typeof SINGLE_CHAIN_GUARD_ERROR__SECRET_HASH_MISMATCH
@@ -108,6 +111,7 @@ if (process.env.NODE_ENV !== 'production') {
     [SINGLE_CHAIN_GUARD_ERROR__NOT_ADMIN]: `Account is not Admin`,
     [SINGLE_CHAIN_GUARD_ERROR__NOT_A_SOLVER]: `Account is not a Solver`,
     [SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER]: `Account is not a User`,
+    [SINGLE_CHAIN_GUARD_ERROR__NOT_A_USER_OR_CANCEL_AUTHORITY]: `Account is not a User or Cancel authority`,
     [SINGLE_CHAIN_GUARD_ERROR__NOT_PENDING_ADMIN]: `Account is not Pending Admin`,
     [SINGLE_CHAIN_GUARD_ERROR__NOT_UPGRADE_AUTHORITY]: `Account is not upgrade authority`,
     [SINGLE_CHAIN_GUARD_ERROR__SECRET_HASH_MISMATCH]: `Secret hash mismatch`,

package/src/core/solana/generated/single-chain/instructions/cancelDcaOrder.ts

@@ -44,6 +44,7 @@ export function getCancelDcaOrderDiscriminatorBytes() {
 
 export type CancelDcaOrderInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountSigner extends string | AccountMeta<string> = string,
   TAccountUser extends string | AccountMeta<string> = string,
   TAccountOrder extends string | AccountMeta<string> = string,
   TAccountGuard extends string | AccountMeta<string> = string,
@@ -56,9 +57,10 @@ export type CancelDcaOrderInstruction<
   InstructionWithData<ReadonlyUint8Array> &
   InstructionWithAccounts<
     [
-      TAccountUser extends string
-        ? WritableSignerAccount<TAccountUser> & AccountSignerMeta<TAccountUser>
-        : TAccountUser,
+      TAccountSigner extends string
+        ? WritableSignerAccount<TAccountSigner> & AccountSignerMeta<TAccountSigner>
+        : TAccountSigner,
+      TAccountUser extends string ? WritableAccount<TAccountUser> : TAccountUser,
       TAccountOrder extends string ? WritableAccount<TAccountOrder> : TAccountOrder,
       TAccountGuard extends string ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
       TAccountTokenInMint extends string
@@ -103,6 +105,7 @@ export function getCancelDcaOrderInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CancelDcaOrderInput<
+  TAccountSigner extends string = string,
   TAccountUser extends string = string,
   TAccountOrder extends string = string,
   TAccountGuard extends string = string,
@@ -111,8 +114,10 @@ export type CancelDcaOrderInput<
   TAccountGuardTokenInAccount extends string = string,
   TAccountTokenInProgram extends string = string,
 > = {
-  /** User that is order creator which wants to cancel the order */
-  user: TransactionSigner<TAccountUser>;
+  /** Either user or cancel authority */
+  signer: TransactionSigner<TAccountSigner>;
+  /** User account that will receive lamports after closing Order account */
+  user: Address<TAccountUser>;
   /** DCA order data */
   order: Address<TAccountOrder>;
   /** Guard address, that protects this DCA order execution */
@@ -128,6 +133,7 @@ export type CancelDcaOrderInput<
 };
 
 export function getCancelDcaOrderInstruction<
+  TAccountSigner extends string,
   TAccountUser extends string,
   TAccountOrder extends string,
   TAccountGuard extends string,
@@ -138,6 +144,7 @@ export function getCancelDcaOrderInstruction<
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: CancelDcaOrderInput<
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -149,6 +156,7 @@ export function getCancelDcaOrderInstruction<
   config?: { programAddress?: TProgramAddress }
 ): CancelDcaOrderInstruction<
   TProgramAddress,
+  TAccountSigner,
   TAccountUser,
   TAccountOrder,
   TAccountGuard,
@@ -162,6 +170,7 @@ export function getCancelDcaOrderInstruction<
 
   // Original accounts.
   const originalAccounts = {
+    signer: { value: input.signer ?? null, isWritable: true },
     user: { value: input.user ?? null, isWritable: true },
     order: { value: input.order ?? null, isWritable: true },
     guard: { value: input.guard ?? null, isWritable: false },
@@ -175,6 +184,7 @@ export function getCancelDcaOrderInstruction<
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
     accounts: [
+      getAccountMeta(accounts.signer),
       getAccountMeta(accounts.user),
       getAccountMeta(accounts.order),
       getAccountMeta(accounts.guard),
@@ -187,6 +197,7 @@ export function getCancelDcaOrderInstruction<
     data: getCancelDcaOrderInstructionDataEncoder().encode({}),
   } as CancelDcaOrderInstruction<
     TProgramAddress,
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -205,20 +216,22 @@ export type ParsedCancelDcaOrderInstruction<
 > = {
   programAddress: Address<TProgram>;
   accounts: {
-    /** User that is order creator which wants to cancel the order */
-    user: TAccountMetas[0];
+    /** Either user or cancel authority */
+    signer: TAccountMetas[0];
+    /** User account that will receive lamports after closing Order account */
+    user: TAccountMetas[1];
     /** DCA order data */
-    order: TAccountMetas[1];
+    order: TAccountMetas[2];
     /** Guard address, that protects this DCA order execution */
-    guard: TAccountMetas[2];
+    guard: TAccountMetas[3];
     /** Token IN mint */
-    tokenInMint: TAccountMetas[3];
+    tokenInMint: TAccountMetas[4];
     /** User token account to which tokens IN will be sent. */
-    userTokenInAccount: TAccountMetas[4];
+    userTokenInAccount: TAccountMetas[5];
     /** Guard token account from which tokens IN will be sent to the user */
-    guardTokenInAccount: TAccountMetas[5];
+    guardTokenInAccount: TAccountMetas[6];
     /** Recovered token program */
-    tokenInProgram: TAccountMetas[6];
+    tokenInProgram: TAccountMetas[7];
   };
   data: CancelDcaOrderInstructionData;
 };
@@ -231,7 +244,7 @@ export function parseCancelDcaOrderInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedCancelDcaOrderInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 7) {
+  if (instruction.accounts.length < 8) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -244,6 +257,7 @@ export function parseCancelDcaOrderInstruction<
   return {
     programAddress: instruction.programAddress,
     accounts: {
+      signer: getNextAccount(),
       user: getNextAccount(),
       order: getNextAccount(),
       guard: getNextAccount(),

package/src/core/solana/generated/single-chain/instructions/cancelLimitOrder.ts

@@ -44,6 +44,7 @@ export function getCancelLimitOrderDiscriminatorBytes() {
 
 export type CancelLimitOrderInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountSigner extends string | AccountMeta<string> = string,
   TAccountUser extends string | AccountMeta<string> = string,
   TAccountOrder extends string | AccountMeta<string> = string,
   TAccountGuard extends string | AccountMeta<string> = string,
@@ -56,9 +57,10 @@ export type CancelLimitOrderInstruction<
   InstructionWithData<ReadonlyUint8Array> &
   InstructionWithAccounts<
     [
-      TAccountUser extends string
-        ? WritableSignerAccount<TAccountUser> & AccountSignerMeta<TAccountUser>
-        : TAccountUser,
+      TAccountSigner extends string
+        ? WritableSignerAccount<TAccountSigner> & AccountSignerMeta<TAccountSigner>
+        : TAccountSigner,
+      TAccountUser extends string ? WritableAccount<TAccountUser> : TAccountUser,
       TAccountOrder extends string ? WritableAccount<TAccountOrder> : TAccountOrder,
       TAccountGuard extends string ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
       TAccountTokenInMint extends string
@@ -103,6 +105,7 @@ export function getCancelLimitOrderInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CancelLimitOrderInput<
+  TAccountSigner extends string = string,
   TAccountUser extends string = string,
   TAccountOrder extends string = string,
   TAccountGuard extends string = string,
@@ -111,8 +114,10 @@ export type CancelLimitOrderInput<
   TAccountGuardTokenInAccount extends string = string,
   TAccountTokenInProgram extends string = string,
 > = {
-  /** User that is order creator which wants to cancel the order */
-  user: TransactionSigner<TAccountUser>;
+  /** Either user or cancel authority */
+  signer: TransactionSigner<TAccountSigner>;
+  /** User account that will receive lamports after closing Order account */
+  user: Address<TAccountUser>;
   /** Order data */
   order: Address<TAccountOrder>;
   /** Guard address, that protects this order execution */
@@ -128,6 +133,7 @@ export type CancelLimitOrderInput<
 };
 
 export function getCancelLimitOrderInstruction<
+  TAccountSigner extends string,
   TAccountUser extends string,
   TAccountOrder extends string,
   TAccountGuard extends string,
@@ -138,6 +144,7 @@ export function getCancelLimitOrderInstruction<
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: CancelLimitOrderInput<
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -149,6 +156,7 @@ export function getCancelLimitOrderInstruction<
   config?: { programAddress?: TProgramAddress }
 ): CancelLimitOrderInstruction<
   TProgramAddress,
+  TAccountSigner,
   TAccountUser,
   TAccountOrder,
   TAccountGuard,
@@ -162,6 +170,7 @@ export function getCancelLimitOrderInstruction<
 
   // Original accounts.
   const originalAccounts = {
+    signer: { value: input.signer ?? null, isWritable: true },
     user: { value: input.user ?? null, isWritable: true },
     order: { value: input.order ?? null, isWritable: true },
     guard: { value: input.guard ?? null, isWritable: false },
@@ -175,6 +184,7 @@ export function getCancelLimitOrderInstruction<
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
     accounts: [
+      getAccountMeta(accounts.signer),
       getAccountMeta(accounts.user),
       getAccountMeta(accounts.order),
       getAccountMeta(accounts.guard),
@@ -187,6 +197,7 @@ export function getCancelLimitOrderInstruction<
     data: getCancelLimitOrderInstructionDataEncoder().encode({}),
   } as CancelLimitOrderInstruction<
     TProgramAddress,
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -205,20 +216,22 @@ export type ParsedCancelLimitOrderInstruction<
 > = {
   programAddress: Address<TProgram>;
   accounts: {
-    /** User that is order creator which wants to cancel the order */
-    user: TAccountMetas[0];
+    /** Either user or cancel authority */
+    signer: TAccountMetas[0];
+    /** User account that will receive lamports after closing Order account */
+    user: TAccountMetas[1];
     /** Order data */
-    order: TAccountMetas[1];
+    order: TAccountMetas[2];
     /** Guard address, that protects this order execution */
-    guard: TAccountMetas[2];
+    guard: TAccountMetas[3];
     /** Token IN mint */
-    tokenInMint: TAccountMetas[3];
+    tokenInMint: TAccountMetas[4];
     /** User token account to which tokens IN will be sent. */
-    userTokenInAccount: TAccountMetas[4];
+    userTokenInAccount: TAccountMetas[5];
     /** Guard token account from which tokens IN will be sent to the user */
-    guardTokenInAccount: TAccountMetas[5];
+    guardTokenInAccount: TAccountMetas[6];
     /** Recovered token program */
-    tokenInProgram: TAccountMetas[6];
+    tokenInProgram: TAccountMetas[7];
   };
   data: CancelLimitOrderInstructionData;
 };
@@ -231,7 +244,7 @@ export function parseCancelLimitOrderInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedCancelLimitOrderInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 7) {
+  if (instruction.accounts.length < 8) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -244,6 +257,7 @@ export function parseCancelLimitOrderInstruction<
   return {
     programAddress: instruction.programAddress,
     accounts: {
+      signer: getNextAccount(),
       user: getNextAccount(),
       order: getNextAccount(),
       guard: getNextAccount(),

package/src/core/solana/generated/single-chain/instructions/fulfillDcaOrderInterval.ts

@@ -67,6 +67,7 @@ export type FulfillDcaOrderIntervalInstruction<
   TAccountSolverTokenOutAccount extends string | AccountMeta<string> = string,
   TAccountDestinationTokenOutAccount extends string | AccountMeta<string> = string,
   TAccountTokenOutProgram extends string | AccountMeta<string> = string,
+  TAccountNativeTokenOutSpender extends string | AccountMeta<string> = string,
   TRemainingAccounts extends readonly AccountMeta<string>[] = [],
 > = Instruction<TProgram> &
   InstructionWithData<ReadonlyUint8Array> &
@@ -121,6 +122,10 @@ export type FulfillDcaOrderIntervalInstruction<
       TAccountTokenOutProgram extends string
         ? ReadonlyAccount<TAccountTokenOutProgram>
         : TAccountTokenOutProgram,
+      TAccountNativeTokenOutSpender extends string
+        ? WritableSignerAccount<TAccountNativeTokenOutSpender> &
+            AccountSignerMeta<TAccountNativeTokenOutSpender>
+        : TAccountNativeTokenOutSpender,
       ...TRemainingAccounts,
     ]
   >;
@@ -185,6 +190,7 @@ export type FulfillDcaOrderIntervalInput<
   TAccountSolverTokenOutAccount extends string = string,
   TAccountDestinationTokenOutAccount extends string = string,
   TAccountTokenOutProgram extends string = string,
+  TAccountNativeTokenOutSpender extends string = string,
 > = {
   /** Solver that fulfills the order */
   solver: TransactionSigner<TAccountSolver>;
@@ -244,6 +250,12 @@ export type FulfillDcaOrderIntervalInput<
    * None if token OUT is native
    */
   tokenOutProgram?: Address<TAccountTokenOutProgram>;
+  /**
+   * If Solver doesn't know amount of native tokens OUT in advance
+   * he may create separate account that will spend all tokens during fulfillment
+   * Should be Some if solver passed `main_amount_out_to_transfer == 0`
+   */
+  nativeTokenOutSpender?: TransactionSigner<TAccountNativeTokenOutSpender>;
   promisedMainAmountOut: FulfillDcaOrderIntervalInstructionDataArgs['promisedMainAmountOut'];
   mainAmountOutToTransfer: FulfillDcaOrderIntervalInstructionDataArgs['mainAmountOutToTransfer'];
 };
@@ -268,6 +280,7 @@ export function getFulfillDcaOrderIntervalInstruction<
   TAccountSolverTokenOutAccount extends string,
   TAccountDestinationTokenOutAccount extends string,
   TAccountTokenOutProgram extends string,
+  TAccountNativeTokenOutSpender extends string,
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: FulfillDcaOrderIntervalInput<
@@ -289,7 +302,8 @@ export function getFulfillDcaOrderIntervalInstruction<
     TAccountTokenOutMint,
     TAccountSolverTokenOutAccount,
     TAccountDestinationTokenOutAccount,
-    TAccountTokenOutProgram
+    TAccountTokenOutProgram,
+    TAccountNativeTokenOutSpender
   >,
   config?: { programAddress?: TProgramAddress }
 ): FulfillDcaOrderIntervalInstruction<
@@ -312,7 +326,8 @@ export function getFulfillDcaOrderIntervalInstruction<
   TAccountTokenOutMint,
   TAccountSolverTokenOutAccount,
   TAccountDestinationTokenOutAccount,
-  TAccountTokenOutProgram
+  TAccountTokenOutProgram,
+  TAccountNativeTokenOutSpender
 > {
   // Program address.
   const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -341,6 +356,7 @@ export function getFulfillDcaOrderIntervalInstruction<
       isWritable: true,
     },
     tokenOutProgram: { value: input.tokenOutProgram ?? null, isWritable: false },
+    nativeTokenOutSpender: { value: input.nativeTokenOutSpender ?? null, isWritable: true },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -379,6 +395,7 @@ export function getFulfillDcaOrderIntervalInstruction<
       getAccountMeta(accounts.solverTokenOutAccount),
       getAccountMeta(accounts.destinationTokenOutAccount),
       getAccountMeta(accounts.tokenOutProgram),
+      getAccountMeta(accounts.nativeTokenOutSpender),
     ],
     programAddress,
     data: getFulfillDcaOrderIntervalInstructionDataEncoder().encode(
@@ -404,7 +421,8 @@ export function getFulfillDcaOrderIntervalInstruction<
     TAccountTokenOutMint,
     TAccountSolverTokenOutAccount,
     TAccountDestinationTokenOutAccount,
-    TAccountTokenOutProgram
+    TAccountTokenOutProgram,
+    TAccountNativeTokenOutSpender
   >;
 
   return instruction;
@@ -480,6 +498,13 @@ export type ParsedFulfillDcaOrderIntervalInstruction<
      */
 
     tokenOutProgram?: TAccountMetas[18] | undefined;
+    /**
+     * If Solver doesn't know amount of native tokens OUT in advance
+     * he may create separate account that will spend all tokens during fulfillment
+     * Should be Some if solver passed `main_amount_out_to_transfer == 0`
+     */
+
+    nativeTokenOutSpender?: TAccountMetas[19] | undefined;
   };
   data: FulfillDcaOrderIntervalInstructionData;
 };
@@ -492,7 +517,7 @@ export function parseFulfillDcaOrderIntervalInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedFulfillDcaOrderIntervalInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 19) {
+  if (instruction.accounts.length < 20) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -528,6 +553,7 @@ export function parseFulfillDcaOrderIntervalInstruction<
       solverTokenOutAccount: getNextOptionalAccount(),
       destinationTokenOutAccount: getNextOptionalAccount(),
       tokenOutProgram: getNextOptionalAccount(),
+      nativeTokenOutSpender: getNextOptionalAccount(),
     },
     data: getFulfillDcaOrderIntervalInstructionDataDecoder().decode(instruction.data),
   };

package/src/core/solana/generated/single-chain/instructions/fulfillLimitOrder.ts

@@ -67,6 +67,7 @@ export type FulfillLimitOrderInstruction<
   TAccountSolverTokenOutAccount extends string | AccountMeta<string> = string,
   TAccountDestinationTokenOutAccount extends string | AccountMeta<string> = string,
   TAccountTokenOutProgram extends string | AccountMeta<string> = string,
+  TAccountNativeTokenOutSpender extends string | AccountMeta<string> = string,
   TRemainingAccounts extends readonly AccountMeta<string>[] = [],
 > = Instruction<TProgram> &
   InstructionWithData<ReadonlyUint8Array> &
@@ -121,6 +122,10 @@ export type FulfillLimitOrderInstruction<
       TAccountTokenOutProgram extends string
         ? ReadonlyAccount<TAccountTokenOutProgram>
         : TAccountTokenOutProgram,
+      TAccountNativeTokenOutSpender extends string
+        ? WritableSignerAccount<TAccountNativeTokenOutSpender> &
+            AccountSignerMeta<TAccountNativeTokenOutSpender>
+        : TAccountNativeTokenOutSpender,
       ...TRemainingAccounts,
     ]
   >;
@@ -185,6 +190,7 @@ export type FulfillLimitOrderInput<
   TAccountSolverTokenOutAccount extends string = string,
   TAccountDestinationTokenOutAccount extends string = string,
   TAccountTokenOutProgram extends string = string,
+  TAccountNativeTokenOutSpender extends string = string,
 > = {
   /** Solver that fulfills the order */
   solver: TransactionSigner<TAccountSolver>;
@@ -244,6 +250,12 @@ export type FulfillLimitOrderInput<
    * None if token OUT is native
    */
   tokenOutProgram?: Address<TAccountTokenOutProgram>;
+  /**
+   * If Solver doesn't know amount of native tokens OUT in advance
+   * he may create separate account that will spend all tokens during fulfillment
+   * Should be Some if solver passed `main_amount_out_to_transfer == 0`
+   */
+  nativeTokenOutSpender?: TransactionSigner<TAccountNativeTokenOutSpender>;
   promisedMainAmountOut: FulfillLimitOrderInstructionDataArgs['promisedMainAmountOut'];
   mainAmountOutToTransfer: FulfillLimitOrderInstructionDataArgs['mainAmountOutToTransfer'];
 };
@@ -268,6 +280,7 @@ export function getFulfillLimitOrderInstruction<
   TAccountSolverTokenOutAccount extends string,
   TAccountDestinationTokenOutAccount extends string,
   TAccountTokenOutProgram extends string,
+  TAccountNativeTokenOutSpender extends string,
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: FulfillLimitOrderInput<
@@ -289,7 +302,8 @@ export function getFulfillLimitOrderInstruction<
     TAccountTokenOutMint,
     TAccountSolverTokenOutAccount,
     TAccountDestinationTokenOutAccount,
-    TAccountTokenOutProgram
+    TAccountTokenOutProgram,
+    TAccountNativeTokenOutSpender
   >,
   config?: { programAddress?: TProgramAddress }
 ): FulfillLimitOrderInstruction<
@@ -312,7 +326,8 @@ export function getFulfillLimitOrderInstruction<
   TAccountTokenOutMint,
   TAccountSolverTokenOutAccount,
   TAccountDestinationTokenOutAccount,
-  TAccountTokenOutProgram
+  TAccountTokenOutProgram,
+  TAccountNativeTokenOutSpender
 > {
   // Program address.
   const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -341,6 +356,7 @@ export function getFulfillLimitOrderInstruction<
       isWritable: true,
     },
     tokenOutProgram: { value: input.tokenOutProgram ?? null, isWritable: false },
+    nativeTokenOutSpender: { value: input.nativeTokenOutSpender ?? null, isWritable: true },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -379,6 +395,7 @@ export function getFulfillLimitOrderInstruction<
       getAccountMeta(accounts.solverTokenOutAccount),
       getAccountMeta(accounts.destinationTokenOutAccount),
       getAccountMeta(accounts.tokenOutProgram),
+      getAccountMeta(accounts.nativeTokenOutSpender),
     ],
     programAddress,
     data: getFulfillLimitOrderInstructionDataEncoder().encode(
@@ -404,7 +421,8 @@ export function getFulfillLimitOrderInstruction<
     TAccountTokenOutMint,
     TAccountSolverTokenOutAccount,
     TAccountDestinationTokenOutAccount,
-    TAccountTokenOutProgram
+    TAccountTokenOutProgram,
+    TAccountNativeTokenOutSpender
   >;
 
   return instruction;
@@ -480,6 +498,13 @@ export type ParsedFulfillLimitOrderInstruction<
      */
 
     tokenOutProgram?: TAccountMetas[18] | undefined;
+    /**
+     * If Solver doesn't know amount of native tokens OUT in advance
+     * he may create separate account that will spend all tokens during fulfillment
+     * Should be Some if solver passed `main_amount_out_to_transfer == 0`
+     */
+
+    nativeTokenOutSpender?: TAccountMetas[19] | undefined;
   };
   data: FulfillLimitOrderInstructionData;
 };
@@ -492,7 +517,7 @@ export function parseFulfillLimitOrderInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedFulfillLimitOrderInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 19) {
+  if (instruction.accounts.length < 20) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -528,6 +553,7 @@ export function parseFulfillLimitOrderInstruction<
       solverTokenOutAccount: getNextOptionalAccount(),
       destinationTokenOutAccount: getNextOptionalAccount(),
       tokenOutProgram: getNextOptionalAccount(),
+      nativeTokenOutSpender: getNextOptionalAccount(),
     },
     data: getFulfillLimitOrderInstructionDataDecoder().decode(instruction.data),
   };

package/src/core/solana/generated/single-chain/instructions/index.ts

@@ -18,3 +18,4 @@ export * from './fulfillLimitOrder.js';
 export * from './initialize.js';
 export * from './setAdmin.js';
 export * from './setAuctioneerPubKey.js';
+export * from './setCancelAuthorities.js';