@shogun-sdk/intents-sdk 1.3.0 → 1.4.1

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

@@ -44,6 +44,7 @@ export function getCancelDcaOrderDiscriminatorBytes() {
 
 export type CancelDcaOrderInstruction<
   TProgram extends string = typeof SOURCE_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,
@@ -64,9 +65,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
@@ -135,6 +137,7 @@ export function getCancelDcaOrderInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CancelDcaOrderInput<
+  TAccountSigner extends string = string,
   TAccountUser extends string = string,
   TAccountOrder extends string = string,
   TAccountGuard extends string = string,
@@ -151,8 +154,10 @@ export type CancelDcaOrderInput<
   TAccountGuardCollateralTokenAccount extends string = string,
   TAccountCollateralTokenProgram 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 */
@@ -190,6 +195,7 @@ export type CancelDcaOrderInput<
 };
 
 export function getCancelDcaOrderInstruction<
+  TAccountSigner extends string,
   TAccountUser extends string,
   TAccountOrder extends string,
   TAccountGuard extends string,
@@ -208,6 +214,7 @@ export function getCancelDcaOrderInstruction<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: CancelDcaOrderInput<
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -227,6 +234,7 @@ export function getCancelDcaOrderInstruction<
   config?: { programAddress?: TProgramAddress }
 ): CancelDcaOrderInstruction<
   TProgramAddress,
+  TAccountSigner,
   TAccountUser,
   TAccountOrder,
   TAccountGuard,
@@ -248,6 +256,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 },
@@ -275,6 +284,7 @@ export function getCancelDcaOrderInstruction<
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
     accounts: [
+      getAccountMeta(accounts.signer),
       getAccountMeta(accounts.user),
       getAccountMeta(accounts.order),
       getAccountMeta(accounts.guard),
@@ -295,6 +305,7 @@ export function getCancelDcaOrderInstruction<
     data: getCancelDcaOrderInstructionDataEncoder().encode({}),
   } as CancelDcaOrderInstruction<
     TProgramAddress,
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -321,44 +332,46 @@ 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 IN account to which remaining tokens IN will be sent. */
-    userTokenInAccount: TAccountMetas[4];
+    userTokenInAccount: TAccountMetas[5];
     /** Guard token IN account from which remaining tokens IN will be sent to the user */
-    guardTokenInAccount: TAccountMetas[5];
+    guardTokenInAccount: TAccountMetas[6];
     /** Token IN program */
-    tokenInProgram: TAccountMetas[6];
+    tokenInProgram: TAccountMetas[7];
     /** Stablecoin mint */
-    stablecoinMint?: TAccountMetas[7] | undefined;
+    stablecoinMint?: TAccountMetas[8] | undefined;
     /**
      * User stablecoin account to which remaining stablecoins (if tokens IN were swapped)
      * will be sent.
      */
 
-    userStablecoinAccount?: TAccountMetas[8] | undefined;
+    userStablecoinAccount?: TAccountMetas[9] | undefined;
     /**
      * Guard stablecoins account from which stablecoins (if tokens IN were swapped)
      * will be sent.
      */
 
-    guardStablecoinAccount?: TAccountMetas[9] | undefined;
+    guardStablecoinAccount?: TAccountMetas[10] | undefined;
     /** Stablecoin program */
-    stablecoinProgram?: TAccountMetas[10] | undefined;
+    stablecoinProgram?: TAccountMetas[11] | undefined;
     /** Collateral token mint */
-    collateralTokenMint?: TAccountMetas[11] | undefined;
+    collateralTokenMint?: TAccountMetas[12] | undefined;
     /** User collateral token account to which collateral tokens (if any) will be sent. */
-    userCollateralTokenAccount?: TAccountMetas[12] | undefined;
+    userCollateralTokenAccount?: TAccountMetas[13] | undefined;
     /** Guard collateral token account from which collateral tokens (if any) will be sent. */
-    guardCollateralTokenAccount?: TAccountMetas[13] | undefined;
+    guardCollateralTokenAccount?: TAccountMetas[14] | undefined;
     /** Solana token program */
-    collateralTokenProgram?: TAccountMetas[14] | undefined;
+    collateralTokenProgram?: TAccountMetas[15] | undefined;
   };
   data: CancelDcaOrderInstructionData;
 };
@@ -371,7 +384,7 @@ export function parseCancelDcaOrderInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedCancelDcaOrderInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 15) {
+  if (instruction.accounts.length < 16) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -388,6 +401,7 @@ export function parseCancelDcaOrderInstruction<
   return {
     programAddress: instruction.programAddress,
     accounts: {
+      signer: getNextAccount(),
       user: getNextAccount(),
       order: getNextAccount(),
       guard: getNextAccount(),

package/src/core/solana/generated/cross-chain/instructions/cancelOrder.ts

@@ -42,6 +42,7 @@ export function getCancelOrderDiscriminatorBytes() {
 
 export type CancelOrderInstruction<
   TProgram extends string = typeof SOURCE_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,
@@ -58,9 +59,10 @@ export type CancelOrderInstruction<
   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,
       TAccountRecoveredTokenMint extends string
@@ -117,6 +119,7 @@ export function getCancelOrderInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CancelOrderInput<
+  TAccountSigner extends string = string,
   TAccountUser extends string = string,
   TAccountOrder extends string = string,
   TAccountGuard extends string = string,
@@ -129,8 +132,10 @@ export type CancelOrderInput<
   TAccountGuardCollateralTokenAccount extends string = string,
   TAccountCollateralTokenProgram 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 */
@@ -162,6 +167,7 @@ export type CancelOrderInput<
 };
 
 export function getCancelOrderInstruction<
+  TAccountSigner extends string,
   TAccountUser extends string,
   TAccountOrder extends string,
   TAccountGuard extends string,
@@ -176,6 +182,7 @@ export function getCancelOrderInstruction<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: CancelOrderInput<
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -191,6 +198,7 @@ export function getCancelOrderInstruction<
   config?: { programAddress?: TProgramAddress }
 ): CancelOrderInstruction<
   TProgramAddress,
+  TAccountSigner,
   TAccountUser,
   TAccountOrder,
   TAccountGuard,
@@ -208,6 +216,7 @@ export function getCancelOrderInstruction<
 
   // 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 },
@@ -234,6 +243,7 @@ export function getCancelOrderInstruction<
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
     accounts: [
+      getAccountMeta(accounts.signer),
       getAccountMeta(accounts.user),
       getAccountMeta(accounts.order),
       getAccountMeta(accounts.guard),
@@ -250,6 +260,7 @@ export function getCancelOrderInstruction<
     data: getCancelOrderInstructionDataEncoder().encode({}),
   } as CancelOrderInstruction<
     TProgramAddress,
+    TAccountSigner,
     TAccountUser,
     TAccountOrder,
     TAccountGuard,
@@ -272,38 +283,40 @@ export type ParsedCancelOrderInstruction<
 > = {
   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];
     /** Recovered token mint */
-    recoveredTokenMint: TAccountMetas[3];
+    recoveredTokenMint: TAccountMetas[4];
     /**
      * User token account to which tokens IN or stablecoins will be sent.
      * - Must be either Token IN account or stablecoin account
      * - Must be same token as Guard token account
      */
 
-    userRecoveredTokenAccount: TAccountMetas[4];
+    userRecoveredTokenAccount: TAccountMetas[5];
     /**
      * Guard token account from which tokens IN or stablecoins will be sent to the user
      * - Must be either Token IN account or stablecoin account
      * - Must be same token as Guard token account
      */
 
-    guardRecoveredTokenAccount: TAccountMetas[5];
+    guardRecoveredTokenAccount: TAccountMetas[6];
     /** Recovered token program */
-    recoveredTokenProgram: TAccountMetas[6];
+    recoveredTokenProgram: TAccountMetas[7];
     /** Recovered token mint */
-    collateralTokenMint: TAccountMetas[7];
+    collateralTokenMint: TAccountMetas[8];
     /** User collateral token account to which taken collateral (if any) will be sent. */
-    userCollateralTokenAccount?: TAccountMetas[8] | undefined;
+    userCollateralTokenAccount?: TAccountMetas[9] | undefined;
     /** Guard collateral token account to which taken collateral (if any) will be sent. */
-    guardCollateralTokenAccount: TAccountMetas[9];
+    guardCollateralTokenAccount: TAccountMetas[10];
     /** Solana token program */
-    collateralTokenProgram: TAccountMetas[10];
+    collateralTokenProgram: TAccountMetas[11];
   };
   data: CancelOrderInstructionData;
 };
@@ -316,7 +329,7 @@ export function parseCancelOrderInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>
 ): ParsedCancelOrderInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 11) {
+  if (instruction.accounts.length < 12) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -333,6 +346,7 @@ export function parseCancelOrderInstruction<
   return {
     programAddress: instruction.programAddress,
     accounts: {
+      signer: getNextAccount(),
       user: getNextAccount(),
       order: getNextAccount(),
       guard: getNextAccount(),