@shogun-sdk/intents-sdk 1.0.2 → 1.1.0

package/src/core/solana/generated/{accounts → cross-chain/accounts}/order.ts

@@ -7,24 +7,21 @@
  */
 
 import {
-  type Account,
   assertAccountExists,
   assertAccountsExist,
   decodeAccount,
+  fetchEncodedAccount,
+  fetchEncodedAccounts,
+  type Account,
   type EncodedAccount,
   type FetchAccountConfig,
   type FetchAccountsConfig,
-  fetchEncodedAccount,
-  fetchEncodedAccounts,
   type MaybeAccount,
   type MaybeEncodedAccount,
 } from '@solana/kit';
-import { type Address, getAddressDecoder, getAddressEncoder } from '@solana/kit';
+import { getAddressDecoder, getAddressEncoder, type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBooleanDecoder,
@@ -37,8 +34,11 @@ import {
   getU32Encoder,
   getU64Decoder,
   getU64Encoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 
 export const ORDER_DISCRIMINATOR = new Uint8Array([134, 173, 223, 185, 77, 86, 28, 51]);

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

@@ -0,0 +1,200 @@
+/**
+ * This code was AUTOGENERATED using the codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+
+import { getProgramDerivedAddress, type Address } from '@solana/kit';
+import {
+  combineCodec,
+  fixDecoderSize,
+  fixEncoderSize,
+  getBytesDecoder,
+  getBytesEncoder,
+  getStructDecoder,
+  getStructEncoder,
+  transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
+} from '@solana/kit';
+import {
+  type IAccountMeta,
+  type IInstruction,
+  type IInstructionWithAccounts,
+  type IInstructionWithData,
+  type WritableAccount,
+  type WritableSignerAccount,
+} from '@solana/kit';
+import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
+import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
+
+export const ACCEPT_ADMIN_DISCRIMINATOR = new Uint8Array([112, 42, 45, 90, 116, 181, 13, 170]);
+
+export function getAcceptAdminDiscriminatorBytes() {
+  return fixEncoderSize(getBytesEncoder(), 8).encode(ACCEPT_ADMIN_DISCRIMINATOR);
+}
+
+export type AcceptAdminInstruction<
+  TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountPendingAdmin extends string | IAccountMeta<string> = string,
+  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
+  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
+> = IInstruction<TProgram> &
+  IInstructionWithData<Uint8Array> &
+  IInstructionWithAccounts<
+    [
+      TAccountPendingAdmin extends string
+        ? WritableSignerAccount<TAccountPendingAdmin> & IAccountSignerMeta<TAccountPendingAdmin>
+        : TAccountPendingAdmin,
+      TAccountAdminSingleton extends string ? WritableAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type AcceptAdminInstructionData = { discriminator: ReadonlyUint8Array };
+
+export type AcceptAdminInstructionDataArgs = {};
+
+export function getAcceptAdminInstructionDataEncoder(): Encoder<AcceptAdminInstructionDataArgs> {
+  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
+    ...value,
+    discriminator: ACCEPT_ADMIN_DISCRIMINATOR,
+  }));
+}
+
+export function getAcceptAdminInstructionDataDecoder(): Decoder<AcceptAdminInstructionData> {
+  return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
+}
+
+export function getAcceptAdminInstructionDataCodec(): Codec<
+  AcceptAdminInstructionDataArgs,
+  AcceptAdminInstructionData
+> {
+  return combineCodec(getAcceptAdminInstructionDataEncoder(), getAcceptAdminInstructionDataDecoder());
+}
+
+export type AcceptAdminAsyncInput<
+  TAccountPendingAdmin extends string = string,
+  TAccountAdminSingleton extends string = string,
+> = {
+  /** Pending Admin signer */
+  pendingAdmin: TransactionSigner<TAccountPendingAdmin>;
+  /** Admin singleton account that grants access to admin functions */
+  adminSingleton?: Address<TAccountAdminSingleton>;
+};
+
+export async function getAcceptAdminInstructionAsync<
+  TAccountPendingAdmin extends string,
+  TAccountAdminSingleton extends string,
+  TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
+>(
+  input: AcceptAdminAsyncInput<TAccountPendingAdmin, TAccountAdminSingleton>,
+  config?: { programAddress?: TProgramAddress },
+): Promise<AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton>> {
+  // Program address.
+  const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    pendingAdmin: { value: input.pendingAdmin ?? null, isWritable: true },
+    adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
+  };
+  const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
+
+  // Resolve default values.
+  if (!accounts.adminSingleton.value) {
+    accounts.adminSingleton.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [getBytesEncoder().encode(new Uint8Array([97, 100, 109, 105, 110]))],
+    });
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [getAccountMeta(accounts.pendingAdmin), getAccountMeta(accounts.adminSingleton)],
+    programAddress,
+    data: getAcceptAdminInstructionDataEncoder().encode({}),
+  } as AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton>;
+
+  return instruction;
+}
+
+export type AcceptAdminInput<
+  TAccountPendingAdmin extends string = string,
+  TAccountAdminSingleton extends string = string,
+> = {
+  /** Pending Admin signer */
+  pendingAdmin: TransactionSigner<TAccountPendingAdmin>;
+  /** Admin singleton account that grants access to admin functions */
+  adminSingleton: Address<TAccountAdminSingleton>;
+};
+
+export function getAcceptAdminInstruction<
+  TAccountPendingAdmin extends string,
+  TAccountAdminSingleton extends string,
+  TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
+>(
+  input: AcceptAdminInput<TAccountPendingAdmin, TAccountAdminSingleton>,
+  config?: { programAddress?: TProgramAddress },
+): AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton> {
+  // Program address.
+  const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    pendingAdmin: { value: input.pendingAdmin ?? null, isWritable: true },
+    adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
+  };
+  const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
+  const instruction = {
+    accounts: [getAccountMeta(accounts.pendingAdmin), getAccountMeta(accounts.adminSingleton)],
+    programAddress,
+    data: getAcceptAdminInstructionDataEncoder().encode({}),
+  } as AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton>;
+
+  return instruction;
+}
+
+export type ParsedAcceptAdminInstruction<
+  TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    /** Pending Admin signer */
+    pendingAdmin: TAccountMetas[0];
+    /** Admin singleton account that grants access to admin functions */
+    adminSingleton: TAccountMetas[1];
+  };
+  data: AcceptAdminInstructionData;
+};
+
+export function parseAcceptAdminInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
+  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+): ParsedAcceptAdminInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 2) {
+    // TODO: Coded error.
+    throw new Error('Not enough accounts');
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = instruction.accounts![accountIndex]!;
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      pendingAdmin: getNextAccount(),
+      adminSingleton: getNextAccount(),
+    },
+    data: getAcceptAdminInstructionDataDecoder().decode(instruction.data),
+  };
+}

package/src/core/solana/generated/{instructions → cross-chain/instructions}/claimTokens.ts

@@ -8,18 +8,18 @@
 
 import { type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 import {
   type IAccountMeta,
@@ -169,11 +169,11 @@ export type ClaimTokensInput<
   recoveredTokenProgram: Address<TAccountRecoveredTokenProgram>;
   /** Recovered token mint */
   collateralTokenMint: Address<TAccountCollateralTokenMint>;
-  /** Solver collateral token account to which taken collateral will be sent. */
+  /** Solver collateral token account to which locked collateral will be sent. */
   solverCollateralTokenAccount: Address<TAccountSolverCollateralTokenAccount>;
-  /** Solver collateral token account to which taken collateral will be sent. */
+  /** User collateral token account to which taken collateral will be sent. */
   userCollateralTokenAccount?: Address<TAccountUserCollateralTokenAccount>;
-  /** Guard collateral token account to which taken collateral will be sent. */
+  /** Guard collateral token account from which locked and taken collateral will be sent. */
   guardCollateralTokenAccount: Address<TAccountGuardCollateralTokenAccount>;
   /** Solana token program */
   collateralTokenProgram: Address<TAccountCollateralTokenProgram>;
@@ -367,11 +367,11 @@ export type ParsedClaimTokensInstruction<
     recoveredTokenProgram: TAccountMetas[8];
     /** Recovered token mint */
     collateralTokenMint: TAccountMetas[9];
-    /** Solver collateral token account to which taken collateral will be sent. */
+    /** Solver collateral token account to which locked collateral will be sent. */
     solverCollateralTokenAccount: TAccountMetas[10];
-    /** Solver collateral token account to which taken collateral will be sent. */
+    /** User collateral token account to which taken collateral will be sent. */
     userCollateralTokenAccount?: TAccountMetas[11] | undefined;
-    /** Guard collateral token account to which taken collateral will be sent. */
+    /** Guard collateral token account from which locked and taken collateral will be sent. */
     guardCollateralTokenAccount: TAccountMetas[12];
     /** Solana token program */
     collateralTokenProgram: TAccountMetas[13];

package/src/core/solana/generated/{instructions → cross-chain/instructions}/collectProtocolFees.ts

@@ -6,20 +6,20 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address, getProgramDerivedAddress } from '@solana/kit';
+import { getProgramDerivedAddress, type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 import {
   type IAccountMeta,
@@ -110,7 +110,7 @@ export type CollectProtocolFeesAsyncInput<
 > = {
   /** Admin signer */
   admin: TransactionSigner<TAccountAdmin>;
-  /** Admin singleton account that grants access to */
+  /** Admin singleton account that grants access to admin functions */
   adminSingleton?: Address<TAccountAdminSingleton>;
   /** Guard account */
   guard: Address<TAccountGuard>;
@@ -229,7 +229,7 @@ export type CollectProtocolFeesInput<
 > = {
   /** Admin signer */
   admin: TransactionSigner<TAccountAdmin>;
-  /** Admin singleton account that grants access to */
+  /** Admin singleton account that grants access to admin functions */
   adminSingleton: Address<TAccountAdminSingleton>;
   /** Guard account */
   guard: Address<TAccountGuard>;
@@ -335,7 +335,7 @@ export type ParsedCollectProtocolFeesInstruction<
   accounts: {
     /** Admin signer */
     admin: TAccountMetas[0];
-    /** Admin singleton account that grants access to */
+    /** Admin singleton account that grants access to admin functions */
     adminSingleton: TAccountMetas[1];
     /** Guard account */
     guard: TAccountMetas[2];

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

@@ -6,20 +6,20 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address, getAddressDecoder, getAddressEncoder, getProgramDerivedAddress } from '@solana/kit';
+import { getAddressDecoder, getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 import {
   type IAccountMeta,

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

@@ -6,12 +6,9 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address, getAddressEncoder, getProgramDerivedAddress } from '@solana/kit';
+import { getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBytesDecoder,
@@ -22,8 +19,11 @@ import {
   getU32Encoder,
   getU64Decoder,
   getU64Encoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 import {
   type IAccountMeta,

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

@@ -6,6 +6,7 @@
  * @see https://github.com/codama-idl/codama
  */
 
+export * from './acceptAdmin.js';
 export * from './cancelOrder.js';
 export * from './claimTokens.js';
 export * from './collectProtocolFees.js';

package/src/core/solana/generated/{instructions → cross-chain/instructions}/initialize.ts

@@ -6,20 +6,20 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address, getProgramDerivedAddress } from '@solana/kit';
+import { getProgramDerivedAddress, type Address } from '@solana/kit';
 import {
-  type Codec,
   combineCodec,
-  type Decoder,
-  type Encoder,
   fixDecoderSize,
   fixEncoderSize,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
   getStructEncoder,
-  type ReadonlyUint8Array,
   transformEncoder,
+  type Codec,
+  type Decoder,
+  type Encoder,
+  type ReadonlyUint8Array,
 } from '@solana/kit';
 import {
   type IAccountMeta,
@@ -45,6 +45,8 @@ export type InitializeInstruction<
   TAccountInitialAdmin extends string | IAccountMeta<string> = string,
   TAccountAdminSingleton extends string | IAccountMeta<string> = string,
   TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
+  TAccountProgram extends string | IAccountMeta<string> = '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V',
+  TAccountProgramData extends string | IAccountMeta<string> = string,
   TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
 > = IInstruction<TProgram> &
   IInstructionWithData<Uint8Array> &
@@ -55,6 +57,8 @@ export type InitializeInstruction<
         : TAccountInitialAdmin,
       TAccountAdminSingleton extends string ? WritableAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
       TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountProgram extends string ? ReadonlyAccount<TAccountProgram> : TAccountProgram,
+      TAccountProgramData extends string ? ReadonlyAccount<TAccountProgramData> : TAccountProgramData,
       ...TRemainingAccounts,
     ]
   >;
@@ -82,6 +86,8 @@ export type InitializeAsyncInput<
   TAccountInitialAdmin extends string = string,
   TAccountAdminSingleton extends string = string,
   TAccountSystemProgram extends string = string,
+  TAccountProgram extends string = string,
+  TAccountProgramData extends string = string,
 > = {
   /** Admin, creating Guard */
   initialAdmin: TransactionSigner<TAccountInitialAdmin>;
@@ -89,18 +95,40 @@ export type InitializeAsyncInput<
   adminSingleton?: Address<TAccountAdminSingleton>;
   /** Solana System program */
   systemProgram?: Address<TAccountSystemProgram>;
+  /** This program */
+  program?: Address<TAccountProgram>;
+  /**
+   * This program ProgramData account to check that only current upgrade authority
+   * can initialize Admin
+   */
+  programData: Address<TAccountProgramData>;
 };
 
 export async function getInitializeInstructionAsync<
   TAccountInitialAdmin extends string,
   TAccountAdminSingleton extends string,
   TAccountSystemProgram extends string,
+  TAccountProgram extends string,
+  TAccountProgramData extends string,
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
-  input: InitializeAsyncInput<TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram>,
+  input: InitializeAsyncInput<
+    TAccountInitialAdmin,
+    TAccountAdminSingleton,
+    TAccountSystemProgram,
+    TAccountProgram,
+    TAccountProgramData
+  >,
   config?: { programAddress?: TProgramAddress },
 ): Promise<
-  InitializeInstruction<TProgramAddress, TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram>
+  InitializeInstruction<
+    TProgramAddress,
+    TAccountInitialAdmin,
+    TAccountAdminSingleton,
+    TAccountSystemProgram,
+    TAccountProgram,
+    TAccountProgramData
+  >
 > {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -110,6 +138,8 @@ export async function getInitializeInstructionAsync<
     initialAdmin: { value: input.initialAdmin ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    program: { value: input.program ?? null, isWritable: false },
+    programData: { value: input.programData ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -123,6 +153,10 @@ export async function getInitializeInstructionAsync<
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
+  if (!accounts.program.value) {
+    accounts.program.value =
+      '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V' as Address<'43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V'>;
+  }
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
@@ -130,10 +164,19 @@ export async function getInitializeInstructionAsync<
       getAccountMeta(accounts.initialAdmin),
       getAccountMeta(accounts.adminSingleton),
       getAccountMeta(accounts.systemProgram),
+      getAccountMeta(accounts.program),
+      getAccountMeta(accounts.programData),
     ],
     programAddress,
     data: getInitializeInstructionDataEncoder().encode({}),
-  } as InitializeInstruction<TProgramAddress, TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram>;
+  } as InitializeInstruction<
+    TProgramAddress,
+    TAccountInitialAdmin,
+    TAccountAdminSingleton,
+    TAccountSystemProgram,
+    TAccountProgram,
+    TAccountProgramData
+  >;
 
   return instruction;
 }
@@ -142,6 +185,8 @@ export type InitializeInput<
   TAccountInitialAdmin extends string = string,
   TAccountAdminSingleton extends string = string,
   TAccountSystemProgram extends string = string,
+  TAccountProgram extends string = string,
+  TAccountProgramData extends string = string,
 > = {
   /** Admin, creating Guard */
   initialAdmin: TransactionSigner<TAccountInitialAdmin>;
@@ -149,17 +194,39 @@ export type InitializeInput<
   adminSingleton: Address<TAccountAdminSingleton>;
   /** Solana System program */
   systemProgram?: Address<TAccountSystemProgram>;
+  /** This program */
+  program?: Address<TAccountProgram>;
+  /**
+   * This program ProgramData account to check that only current upgrade authority
+   * can initialize Admin
+   */
+  programData: Address<TAccountProgramData>;
 };
 
 export function getInitializeInstruction<
   TAccountInitialAdmin extends string,
   TAccountAdminSingleton extends string,
   TAccountSystemProgram extends string,
+  TAccountProgram extends string,
+  TAccountProgramData extends string,
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
-  input: InitializeInput<TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram>,
+  input: InitializeInput<
+    TAccountInitialAdmin,
+    TAccountAdminSingleton,
+    TAccountSystemProgram,
+    TAccountProgram,
+    TAccountProgramData
+  >,
   config?: { programAddress?: TProgramAddress },
-): InitializeInstruction<TProgramAddress, TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram> {
+): InitializeInstruction<
+  TProgramAddress,
+  TAccountInitialAdmin,
+  TAccountAdminSingleton,
+  TAccountSystemProgram,
+  TAccountProgram,
+  TAccountProgramData
+> {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
 
@@ -168,6 +235,8 @@ export function getInitializeInstruction<
     initialAdmin: { value: input.initialAdmin ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: true },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    program: { value: input.program ?? null, isWritable: false },
+    programData: { value: input.programData ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -175,6 +244,10 @@ export function getInitializeInstruction<
   if (!accounts.systemProgram.value) {
     accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
+  if (!accounts.program.value) {
+    accounts.program.value =
+      '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V' as Address<'43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V'>;
+  }
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
@@ -182,10 +255,19 @@ export function getInitializeInstruction<
       getAccountMeta(accounts.initialAdmin),
       getAccountMeta(accounts.adminSingleton),
       getAccountMeta(accounts.systemProgram),
+      getAccountMeta(accounts.program),
+      getAccountMeta(accounts.programData),
     ],
     programAddress,
     data: getInitializeInstructionDataEncoder().encode({}),
-  } as InitializeInstruction<TProgramAddress, TAccountInitialAdmin, TAccountAdminSingleton, TAccountSystemProgram>;
+  } as InitializeInstruction<
+    TProgramAddress,
+    TAccountInitialAdmin,
+    TAccountAdminSingleton,
+    TAccountSystemProgram,
+    TAccountProgram,
+    TAccountProgramData
+  >;
 
   return instruction;
 }
@@ -202,6 +284,14 @@ export type ParsedInitializeInstruction<
     adminSingleton: TAccountMetas[1];
     /** Solana System program */
     systemProgram: TAccountMetas[2];
+    /** This program */
+    program: TAccountMetas[3];
+    /**
+     * This program ProgramData account to check that only current upgrade authority
+     * can initialize Admin
+     */
+
+    programData: TAccountMetas[4];
   };
   data: InitializeInstructionData;
 };
@@ -209,7 +299,7 @@ export type ParsedInitializeInstruction<
 export function parseInitializeInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
   instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
 ): ParsedInitializeInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 3) {
+  if (instruction.accounts.length < 5) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
@@ -225,6 +315,8 @@ export function parseInitializeInstruction<TProgram extends string, TAccountMeta
       initialAdmin: getNextAccount(),
       adminSingleton: getNextAccount(),
       systemProgram: getNextAccount(),
+      program: getNextAccount(),
+      programData: getNextAccount(),
     },
     data: getInitializeInstructionDataDecoder().decode(instruction.data),
   };