@shogun-sdk/intents-sdk 1.2.1 → 1.2.3

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

@@ -6,7 +6,12 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { getAddressDecoder, getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
+import {
+  getAddressDecoder,
+  getAddressEncoder,
+  getProgramDerivedAddress,
+  type Address,
+} from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -15,22 +20,24 @@ import {
   getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
+  getU8Decoder,
+  getU8Encoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 import {
-  type IAccountMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type ReadonlyAccount,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/kit';
-import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
 import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { expectAddress, getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -42,28 +49,34 @@ export function getCreateGuardDiscriminatorBytes() {
 
 export type CreateGuardInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountAdmin extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
-  TAccountAssociatedTokenProgram extends string | IAccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
-  TAccountCollateralTokenMint extends string | IAccountMeta<string> = string,
-  TAccountCollateralTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountCollateralTokenProgram extends string | IAccountMeta<string> = string,
-  TAccountStablecoinTokenMint extends string | IAccountMeta<string> = string,
-  TAccountStablecoinTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountStablecoinTokenProgram extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountAdmin extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TAccountAssociatedTokenProgram extends
+    | string
+    | AccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
+  TAccountCollateralTokenMint extends string | AccountMeta<string> = string,
+  TAccountCollateralTokenAccount extends string | AccountMeta<string> = string,
+  TAccountCollateralTokenProgram extends string | AccountMeta<string> = string,
+  TAccountStablecoinTokenMint extends string | AccountMeta<string> = string,
+  TAccountStablecoinTokenAccount extends string | AccountMeta<string> = string,
+  TAccountStablecoinTokenProgram extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountAdmin extends string
-        ? WritableSignerAccount<TAccountAdmin> & IAccountSignerMeta<TAccountAdmin>
+        ? WritableSignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin>
         : TAccountAdmin,
       TAccountGuard extends string ? WritableAccount<TAccountGuard> : TAccountGuard,
-      TAccountAdminSingleton extends string ? ReadonlyAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
-      TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountAdminSingleton extends string
+        ? ReadonlyAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
       TAccountAssociatedTokenProgram extends string
         ? ReadonlyAccount<TAccountAssociatedTokenProgram>
         : TAccountAssociatedTokenProgram,
@@ -92,32 +105,38 @@ export type CreateGuardInstruction<
 export type CreateGuardInstructionData = {
   discriminator: ReadonlyUint8Array;
   auctioneerPubKey: Address;
+  guardVersion: number;
 };
 
-export type CreateGuardInstructionDataArgs = { auctioneerPubKey: Address };
+export type CreateGuardInstructionDataArgs = { auctioneerPubKey: Address; guardVersion: number };
 
-export function getCreateGuardInstructionDataEncoder(): Encoder<CreateGuardInstructionDataArgs> {
+export function getCreateGuardInstructionDataEncoder(): FixedSizeEncoder<CreateGuardInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['auctioneerPubKey', getAddressEncoder()],
+      ['guardVersion', getU8Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: CREATE_GUARD_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: CREATE_GUARD_DISCRIMINATOR })
   );
 }
 
-export function getCreateGuardInstructionDataDecoder(): Decoder<CreateGuardInstructionData> {
+export function getCreateGuardInstructionDataDecoder(): FixedSizeDecoder<CreateGuardInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['auctioneerPubKey', getAddressDecoder()],
+    ['guardVersion', getU8Decoder()],
   ]);
 }
 
-export function getCreateGuardInstructionDataCodec(): Codec<
+export function getCreateGuardInstructionDataCodec(): FixedSizeCodec<
   CreateGuardInstructionDataArgs,
   CreateGuardInstructionData
 > {
-  return combineCodec(getCreateGuardInstructionDataEncoder(), getCreateGuardInstructionDataDecoder());
+  return combineCodec(
+    getCreateGuardInstructionDataEncoder(),
+    getCreateGuardInstructionDataDecoder()
+  );
 }
 
 export type CreateGuardAsyncInput<
@@ -136,7 +155,7 @@ export type CreateGuardAsyncInput<
   /** Admin, creating Guard */
   admin: TransactionSigner<TAccountAdmin>;
   /** Account that will store guard data */
-  guard?: Address<TAccountGuard>;
+  guard: Address<TAccountGuard>;
   /** Admin singleton account that allows Guard creation */
   adminSingleton?: Address<TAccountAdminSingleton>;
   /** Solana System program */
@@ -159,6 +178,7 @@ export type CreateGuardAsyncInput<
   /** Solana token program */
   stablecoinTokenProgram: Address<TAccountStablecoinTokenProgram>;
   auctioneerPubKey: CreateGuardInstructionDataArgs['auctioneerPubKey'];
+  guardVersion: CreateGuardInstructionDataArgs['guardVersion'];
 };
 
 export async function getCreateGuardInstructionAsync<
@@ -188,7 +208,7 @@ export async function getCreateGuardInstructionAsync<
     TAccountStablecoinTokenAccount,
     TAccountStablecoinTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   CreateGuardInstruction<
     TProgramAddress,
@@ -228,16 +248,6 @@ export async function getCreateGuardInstructionAsync<
   const args = { ...input };
 
   // Resolve default values.
-  if (!accounts.guard.value) {
-    accounts.guard.value = await getProgramDerivedAddress({
-      programAddress,
-      seeds: [
-        getBytesEncoder().encode(new Uint8Array([103, 117, 97, 114, 100])),
-        getAddressEncoder().encode(expectAddress(accounts.collateralTokenMint.value)),
-        getAddressEncoder().encode(expectAddress(accounts.stablecoinTokenMint.value)),
-      ],
-    });
-  }
   if (!accounts.adminSingleton.value) {
     accounts.adminSingleton.value = await getProgramDerivedAddress({
       programAddress,
@@ -245,7 +255,8 @@ export async function getCreateGuardInstructionAsync<
     });
   }
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -348,6 +359,7 @@ export type CreateGuardInput<
   /** Solana token program */
   stablecoinTokenProgram: Address<TAccountStablecoinTokenProgram>;
   auctioneerPubKey: CreateGuardInstructionDataArgs['auctioneerPubKey'];
+  guardVersion: CreateGuardInstructionDataArgs['guardVersion'];
 };
 
 export function getCreateGuardInstruction<
@@ -377,7 +389,7 @@ export function getCreateGuardInstruction<
     TAccountStablecoinTokenAccount,
     TAccountStablecoinTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CreateGuardInstruction<
   TProgramAddress,
   TAccountAdmin,
@@ -416,7 +428,8 @@ export function getCreateGuardInstruction<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -460,7 +473,7 @@ export function getCreateGuardInstruction<
 
 export type ParsedCreateGuardInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -494,8 +507,13 @@ export type ParsedCreateGuardInstruction<
   data: CreateGuardInstructionData;
 };
 
-export function parseCreateGuardInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseCreateGuardInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedCreateGuardInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 11) {
     // TODO: Coded error.
@@ -503,7 +521,7 @@ export function parseCreateGuardInstruction<TProgram extends string, TAccountMet
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };

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

@@ -6,7 +6,7 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
+import { getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -20,21 +20,21 @@ import {
   getU64Decoder,
   getU64Encoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 import {
-  type IAccountMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type ReadonlyAccount,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/kit';
-import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
 import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { expectAddress, getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -46,39 +46,47 @@ export function getCreateOrderDiscriminatorBytes() {
 
 export type CreateOrderInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountUser extends string | IAccountMeta<string> = string,
-  TAccountOrder extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
-  TAccountAssociatedTokenProgram extends string | IAccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
-  TAccountTokenInMint extends string | IAccountMeta<string> = string,
-  TAccountUserTokenInAccount extends string | IAccountMeta<string> = string,
-  TAccountGuardTokenInAccount extends string | IAccountMeta<string> = string,
-  TAccountTokenInProgram extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountUser extends string | AccountMeta<string> = string,
+  TAccountOrder extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TAccountAssociatedTokenProgram extends
+    | string
+    | AccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
+  TAccountTokenInMint extends string | AccountMeta<string> = string,
+  TAccountUserTokenInAccount extends string | AccountMeta<string> = string,
+  TAccountGuardTokenInAccount extends string | AccountMeta<string> = string,
+  TAccountTokenInProgram extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountUser extends string
-        ? WritableSignerAccount<TAccountUser> & IAccountSignerMeta<TAccountUser>
+        ? WritableSignerAccount<TAccountUser> & AccountSignerMeta<TAccountUser>
         : TAccountUser,
       TAccountOrder extends string
-        ? WritableSignerAccount<TAccountOrder> & IAccountSignerMeta<TAccountOrder>
+        ? WritableSignerAccount<TAccountOrder> & AccountSignerMeta<TAccountOrder>
         : TAccountOrder,
       TAccountGuard extends string ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
-      TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
       TAccountAssociatedTokenProgram extends string
         ? ReadonlyAccount<TAccountAssociatedTokenProgram>
         : TAccountAssociatedTokenProgram,
-      TAccountTokenInMint extends string ? ReadonlyAccount<TAccountTokenInMint> : TAccountTokenInMint,
+      TAccountTokenInMint extends string
+        ? ReadonlyAccount<TAccountTokenInMint>
+        : TAccountTokenInMint,
       TAccountUserTokenInAccount extends string
         ? WritableAccount<TAccountUserTokenInAccount>
         : TAccountUserTokenInAccount,
       TAccountGuardTokenInAccount extends string
         ? WritableAccount<TAccountGuardTokenInAccount>
         : TAccountGuardTokenInAccount,
-      TAccountTokenInProgram extends string ? ReadonlyAccount<TAccountTokenInProgram> : TAccountTokenInProgram,
+      TAccountTokenInProgram extends string
+        ? ReadonlyAccount<TAccountTokenInProgram>
+        : TAccountTokenInProgram,
       ...TRemainingAccounts,
     ]
   >;
@@ -98,7 +106,7 @@ export type CreateOrderInstructionDataArgs = {
   executionDetailsHash: ReadonlyUint8Array;
 };
 
-export function getCreateOrderInstructionDataEncoder(): Encoder<CreateOrderInstructionDataArgs> {
+export function getCreateOrderInstructionDataEncoder(): FixedSizeEncoder<CreateOrderInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
@@ -107,11 +115,11 @@ export function getCreateOrderInstructionDataEncoder(): Encoder<CreateOrderInstr
       ['deadline', getU32Encoder()],
       ['executionDetailsHash', fixEncoderSize(getBytesEncoder(), 32)],
     ]),
-    (value) => ({ ...value, discriminator: CREATE_ORDER_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: CREATE_ORDER_DISCRIMINATOR })
   );
 }
 
-export function getCreateOrderInstructionDataDecoder(): Decoder<CreateOrderInstructionData> {
+export function getCreateOrderInstructionDataDecoder(): FixedSizeDecoder<CreateOrderInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['amountIn', getU64Decoder()],
@@ -121,11 +129,14 @@ export function getCreateOrderInstructionDataDecoder(): Decoder<CreateOrderInstr
   ]);
 }
 
-export function getCreateOrderInstructionDataCodec(): Codec<
+export function getCreateOrderInstructionDataCodec(): FixedSizeCodec<
   CreateOrderInstructionDataArgs,
   CreateOrderInstructionData
 > {
-  return combineCodec(getCreateOrderInstructionDataEncoder(), getCreateOrderInstructionDataDecoder());
+  return combineCodec(
+    getCreateOrderInstructionDataEncoder(),
+    getCreateOrderInstructionDataDecoder()
+  );
 }
 
 export type CreateOrderAsyncInput<
@@ -186,7 +197,7 @@ export async function getCreateOrderInstructionAsync<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   CreateOrderInstruction<
     TProgramAddress,
@@ -223,7 +234,8 @@ export async function getCreateOrderInstructionAsync<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -330,7 +342,7 @@ export function getCreateOrderInstruction<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CreateOrderInstruction<
   TProgramAddress,
   TAccountUser,
@@ -365,7 +377,8 @@ export function getCreateOrderInstruction<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -405,7 +418,7 @@ export function getCreateOrderInstruction<
 
 export type ParsedCreateOrderInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -431,8 +444,13 @@ export type ParsedCreateOrderInstruction<
   data: CreateOrderInstructionData;
 };
 
-export function parseCreateOrderInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseCreateOrderInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedCreateOrderInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 9) {
     // TODO: Coded error.
@@ -440,7 +458,7 @@ export function parseCreateOrderInstruction<TProgram extends string, TAccountMet
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };

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

@@ -7,9 +7,11 @@
  */
 
 export * from './acceptAdmin.js';
+export * from './cancelDcaOrder.js';
 export * from './cancelOrder.js';
 export * from './claimTokens.js';
 export * from './collectProtocolFees.js';
+export * from './createDcaOrder.js';
 export * from './createGuard.js';
 export * from './createOrder.js';
 export * from './initialize.js';