@epicentral/sos-sdk 0.9.1-beta → 0.10.1-beta

package/generated/instructions/autoExerciseExpired.ts

@@ -55,6 +55,7 @@ export type AutoExerciseExpiredInstruction<
   TAccountOptionPool extends string | AccountMeta<string> = string,
   TAccountOptionAccount extends string | AccountMeta<string> = string,
   TAccountUnderlyingMint extends string | AccountMeta<string> = string,
+  TAccountCollateralMint extends string | AccountMeta<string> = string,
   TAccountPositionAccount extends string | AccountMeta<string> = string,
   TAccountCollateralVault extends string | AccountMeta<string> = string,
   TAccountBuyerPaymentAccount extends string | AccountMeta<string> = string,
@@ -66,8 +67,6 @@ export type AutoExerciseExpiredInstruction<
   TAccountInstructionsSysvar extends string | AccountMeta<string> =
     "Sysvar1nstructions1111111111111111111111111",
   TAccountMarketData extends string | AccountMeta<string> = string,
-  TAccountOmlpVault extends string | AccountMeta<string> = string,
-  TAccountOmlpVaultState extends string | AccountMeta<string> = string,
   TAccountKeeper extends string | AccountMeta<string> = string,
   TAccountTokenProgram extends string | AccountMeta<string> =
     "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
@@ -90,6 +89,9 @@ export type AutoExerciseExpiredInstruction<
       TAccountUnderlyingMint extends string
         ? ReadonlyAccount<TAccountUnderlyingMint>
         : TAccountUnderlyingMint,
+      TAccountCollateralMint extends string
+        ? ReadonlyAccount<TAccountCollateralMint>
+        : TAccountCollateralMint,
       TAccountPositionAccount extends string
         ? WritableAccount<TAccountPositionAccount>
         : TAccountPositionAccount,
@@ -117,12 +119,6 @@ export type AutoExerciseExpiredInstruction<
       TAccountMarketData extends string
         ? ReadonlyAccount<TAccountMarketData>
         : TAccountMarketData,
-      TAccountOmlpVault extends string
-        ? WritableAccount<TAccountOmlpVault>
-        : TAccountOmlpVault,
-      TAccountOmlpVaultState extends string
-        ? WritableAccount<TAccountOmlpVaultState>
-        : TAccountOmlpVaultState,
       TAccountKeeper extends string
         ? WritableSignerAccount<TAccountKeeper> &
             AccountSignerMeta<TAccountKeeper>
@@ -174,6 +170,7 @@ export type AutoExerciseExpiredAsyncInput<
   TAccountOptionPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountPositionAccount extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountBuyerPaymentAccount extends string = string,
@@ -183,8 +180,6 @@ export type AutoExerciseExpiredAsyncInput<
   TAccountSlotHashesSysvar extends string = string,
   TAccountInstructionsSysvar extends string = string,
   TAccountMarketData extends string = string,
-  TAccountOmlpVault extends string = string,
-  TAccountOmlpVaultState extends string = string,
   TAccountKeeper extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
@@ -194,6 +189,7 @@ export type AutoExerciseExpiredAsyncInput<
   optionAccount: Address<TAccountOptionAccount>;
   /** Underlying token mint (for dynamic decimal handling - supports any SPL token) */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  collateralMint: Address<TAccountCollateralMint>;
   /**
    * Buyer's position (tracks quantity owned)
    * Note: NO signer constraint - keeper exercises on behalf of buyer
@@ -201,7 +197,7 @@ export type AutoExerciseExpiredAsyncInput<
   positionAccount: Address<TAccountPositionAccount>;
   /** Pool's collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
-  /** Buyer's WSOL account (receives intrinsic value) */
+  /** Buyer's settlement token account (receives intrinsic value) */
   buyerPaymentAccount: Address<TAccountBuyerPaymentAccount>;
   /** Buyer's option token account (burns tokens) */
   buyerOptionAccount: Address<TAccountBuyerOptionAccount>;
@@ -212,16 +208,6 @@ export type AutoExerciseExpiredAsyncInput<
   instructionsSysvar?: Address<TAccountInstructionsSysvar>;
   /** Market data for this underlying asset (contains switchboard_feed_id) */
   marketData: Address<TAccountMarketData>;
-  /** OMLP Vault token account to receive repayments */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: keeps `total_loans`, `total_liquidity`,
-   * and `acc_interest_per_share_fp` consistent via `add_interest_to_index`
-   * so auto-exercised lender repayments actually realize interest to LPs).
-   * Constrained to the vault matching `underlying_mint` — same mint the
-   * collateral vault settles in.
-   */
-  omlpVaultState?: Address<TAccountOmlpVaultState>;
   /** Keeper who pays for gas - anyone can call this after expiration */
   keeper: TransactionSigner<TAccountKeeper>;
   tokenProgram?: Address<TAccountTokenProgram>;
@@ -233,6 +219,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
   TAccountOptionPool extends string,
   TAccountOptionAccount extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountPositionAccount extends string,
   TAccountCollateralVault extends string,
   TAccountBuyerPaymentAccount extends string,
@@ -242,8 +229,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
   TAccountSlotHashesSysvar extends string,
   TAccountInstructionsSysvar extends string,
   TAccountMarketData extends string,
-  TAccountOmlpVault extends string,
-  TAccountOmlpVaultState extends string,
   TAccountKeeper extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
@@ -254,6 +239,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountPositionAccount,
     TAccountCollateralVault,
     TAccountBuyerPaymentAccount,
@@ -263,8 +249,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountSlotHashesSysvar,
     TAccountInstructionsSysvar,
     TAccountMarketData,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -277,6 +261,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountPositionAccount,
     TAccountCollateralVault,
     TAccountBuyerPaymentAccount,
@@ -286,8 +271,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountSlotHashesSysvar,
     TAccountInstructionsSysvar,
     TAccountMarketData,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -303,6 +286,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
     optionPool: { value: input.optionPool ?? null, isWritable: true },
     optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     underlyingMint: { value: input.underlyingMint ?? null, isWritable: false },
+    collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     positionAccount: { value: input.positionAccount ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     buyerPaymentAccount: {
@@ -327,8 +311,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
       isWritable: false,
     },
     marketData: { value: input.marketData ?? null, isWritable: false },
-    omlpVault: { value: input.omlpVault ?? null, isWritable: true },
-    omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     keeper: { value: input.keeper ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
@@ -361,17 +343,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
     accounts.instructionsSysvar.value =
       "Sysvar1nstructions1111111111111111111111111" as Address<"Sysvar1nstructions1111111111111111111111111">;
   }
-  if (!accounts.omlpVaultState.value) {
-    accounts.omlpVaultState.value = await getProgramDerivedAddress({
-      programAddress,
-      seeds: [
-        getBytesEncoder().encode(new Uint8Array([118, 97, 117, 108, 116])),
-        getAddressEncoder().encode(
-          expectAddress(accounts.underlyingMint.value),
-        ),
-      ],
-    });
-  }
   if (!accounts.tokenProgram.value) {
     accounts.tokenProgram.value =
       "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
@@ -388,6 +359,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.positionAccount),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.buyerPaymentAccount),
@@ -397,8 +369,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
       getAccountMeta(accounts.slotHashesSysvar),
       getAccountMeta(accounts.instructionsSysvar),
       getAccountMeta(accounts.marketData),
-      getAccountMeta(accounts.omlpVault),
-      getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.keeper),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
@@ -411,6 +381,7 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountPositionAccount,
     TAccountCollateralVault,
     TAccountBuyerPaymentAccount,
@@ -420,8 +391,6 @@ export async function getAutoExerciseExpiredInstructionAsync<
     TAccountSlotHashesSysvar,
     TAccountInstructionsSysvar,
     TAccountMarketData,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -433,6 +402,7 @@ export type AutoExerciseExpiredInput<
   TAccountOptionPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountPositionAccount extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountBuyerPaymentAccount extends string = string,
@@ -442,8 +412,6 @@ export type AutoExerciseExpiredInput<
   TAccountSlotHashesSysvar extends string = string,
   TAccountInstructionsSysvar extends string = string,
   TAccountMarketData extends string = string,
-  TAccountOmlpVault extends string = string,
-  TAccountOmlpVaultState extends string = string,
   TAccountKeeper extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
@@ -453,6 +421,7 @@ export type AutoExerciseExpiredInput<
   optionAccount: Address<TAccountOptionAccount>;
   /** Underlying token mint (for dynamic decimal handling - supports any SPL token) */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  collateralMint: Address<TAccountCollateralMint>;
   /**
    * Buyer's position (tracks quantity owned)
    * Note: NO signer constraint - keeper exercises on behalf of buyer
@@ -460,7 +429,7 @@ export type AutoExerciseExpiredInput<
   positionAccount: Address<TAccountPositionAccount>;
   /** Pool's collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
-  /** Buyer's WSOL account (receives intrinsic value) */
+  /** Buyer's settlement token account (receives intrinsic value) */
   buyerPaymentAccount: Address<TAccountBuyerPaymentAccount>;
   /** Buyer's option token account (burns tokens) */
   buyerOptionAccount: Address<TAccountBuyerOptionAccount>;
@@ -471,16 +440,6 @@ export type AutoExerciseExpiredInput<
   instructionsSysvar?: Address<TAccountInstructionsSysvar>;
   /** Market data for this underlying asset (contains switchboard_feed_id) */
   marketData: Address<TAccountMarketData>;
-  /** OMLP Vault token account to receive repayments */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: keeps `total_loans`, `total_liquidity`,
-   * and `acc_interest_per_share_fp` consistent via `add_interest_to_index`
-   * so auto-exercised lender repayments actually realize interest to LPs).
-   * Constrained to the vault matching `underlying_mint` — same mint the
-   * collateral vault settles in.
-   */
-  omlpVaultState: Address<TAccountOmlpVaultState>;
   /** Keeper who pays for gas - anyone can call this after expiration */
   keeper: TransactionSigner<TAccountKeeper>;
   tokenProgram?: Address<TAccountTokenProgram>;
@@ -492,6 +451,7 @@ export function getAutoExerciseExpiredInstruction<
   TAccountOptionPool extends string,
   TAccountOptionAccount extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountPositionAccount extends string,
   TAccountCollateralVault extends string,
   TAccountBuyerPaymentAccount extends string,
@@ -501,8 +461,6 @@ export function getAutoExerciseExpiredInstruction<
   TAccountSlotHashesSysvar extends string,
   TAccountInstructionsSysvar extends string,
   TAccountMarketData extends string,
-  TAccountOmlpVault extends string,
-  TAccountOmlpVaultState extends string,
   TAccountKeeper extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
@@ -513,6 +471,7 @@ export function getAutoExerciseExpiredInstruction<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountPositionAccount,
     TAccountCollateralVault,
     TAccountBuyerPaymentAccount,
@@ -522,8 +481,6 @@ export function getAutoExerciseExpiredInstruction<
     TAccountSlotHashesSysvar,
     TAccountInstructionsSysvar,
     TAccountMarketData,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -535,6 +492,7 @@ export function getAutoExerciseExpiredInstruction<
   TAccountOptionPool,
   TAccountOptionAccount,
   TAccountUnderlyingMint,
+  TAccountCollateralMint,
   TAccountPositionAccount,
   TAccountCollateralVault,
   TAccountBuyerPaymentAccount,
@@ -544,8 +502,6 @@ export function getAutoExerciseExpiredInstruction<
   TAccountSlotHashesSysvar,
   TAccountInstructionsSysvar,
   TAccountMarketData,
-  TAccountOmlpVault,
-  TAccountOmlpVaultState,
   TAccountKeeper,
   TAccountTokenProgram,
   TAccountSystemProgram
@@ -560,6 +516,7 @@ export function getAutoExerciseExpiredInstruction<
     optionPool: { value: input.optionPool ?? null, isWritable: true },
     optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     underlyingMint: { value: input.underlyingMint ?? null, isWritable: false },
+    collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     positionAccount: { value: input.positionAccount ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     buyerPaymentAccount: {
@@ -584,8 +541,6 @@ export function getAutoExerciseExpiredInstruction<
       isWritable: false,
     },
     marketData: { value: input.marketData ?? null, isWritable: false },
-    omlpVault: { value: input.omlpVault ?? null, isWritable: true },
-    omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     keeper: { value: input.keeper ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
@@ -620,6 +575,7 @@ export function getAutoExerciseExpiredInstruction<
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.positionAccount),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.buyerPaymentAccount),
@@ -629,8 +585,6 @@ export function getAutoExerciseExpiredInstruction<
       getAccountMeta(accounts.slotHashesSysvar),
       getAccountMeta(accounts.instructionsSysvar),
       getAccountMeta(accounts.marketData),
-      getAccountMeta(accounts.omlpVault),
-      getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.keeper),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
@@ -643,6 +597,7 @@ export function getAutoExerciseExpiredInstruction<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountPositionAccount,
     TAccountCollateralVault,
     TAccountBuyerPaymentAccount,
@@ -652,8 +607,6 @@ export function getAutoExerciseExpiredInstruction<
     TAccountSlotHashesSysvar,
     TAccountInstructionsSysvar,
     TAccountMarketData,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -671,38 +624,29 @@ export type ParsedAutoExerciseExpiredInstruction<
     optionAccount: TAccountMetas[2];
     /** Underlying token mint (for dynamic decimal handling - supports any SPL token) */
     underlyingMint: TAccountMetas[3];
+    collateralMint: TAccountMetas[4];
     /**
      * Buyer's position (tracks quantity owned)
      * Note: NO signer constraint - keeper exercises on behalf of buyer
      */
-    positionAccount: TAccountMetas[4];
+    positionAccount: TAccountMetas[5];
     /** Pool's collateral vault (source of payout) */
-    collateralVault: TAccountMetas[5];
-    /** Buyer's WSOL account (receives intrinsic value) */
-    buyerPaymentAccount: TAccountMetas[6];
+    collateralVault: TAccountMetas[6];
+    /** Buyer's settlement token account (receives intrinsic value) */
+    buyerPaymentAccount: TAccountMetas[7];
     /** Buyer's option token account (burns tokens) */
-    buyerOptionAccount: TAccountMetas[7];
+    buyerOptionAccount: TAccountMetas[8];
     /** Option mint (for burning) */
-    optionMint: TAccountMetas[8];
-    switchboardQueue: TAccountMetas[9];
-    slotHashesSysvar: TAccountMetas[10];
-    instructionsSysvar: TAccountMetas[11];
+    optionMint: TAccountMetas[9];
+    switchboardQueue: TAccountMetas[10];
+    slotHashesSysvar: TAccountMetas[11];
+    instructionsSysvar: TAccountMetas[12];
     /** Market data for this underlying asset (contains switchboard_feed_id) */
-    marketData: TAccountMetas[12];
-    /** OMLP Vault token account to receive repayments */
-    omlpVault: TAccountMetas[13];
-    /**
-     * OMLP Vault state PDA (mut: keeps `total_loans`, `total_liquidity`,
-     * and `acc_interest_per_share_fp` consistent via `add_interest_to_index`
-     * so auto-exercised lender repayments actually realize interest to LPs).
-     * Constrained to the vault matching `underlying_mint` — same mint the
-     * collateral vault settles in.
-     */
-    omlpVaultState: TAccountMetas[14];
+    marketData: TAccountMetas[13];
     /** Keeper who pays for gas - anyone can call this after expiration */
-    keeper: TAccountMetas[15];
-    tokenProgram: TAccountMetas[16];
-    systemProgram: TAccountMetas[17];
+    keeper: TAccountMetas[14];
+    tokenProgram: TAccountMetas[15];
+    systemProgram: TAccountMetas[16];
   };
   data: AutoExerciseExpiredInstructionData;
 };
@@ -715,7 +659,7 @@ export function parseAutoExerciseExpiredInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>,
 ): ParsedAutoExerciseExpiredInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 18) {
+  if (instruction.accounts.length < 17) {
     // TODO: Coded error.
     throw new Error("Not enough accounts");
   }
@@ -732,6 +676,7 @@ export function parseAutoExerciseExpiredInstruction<
       optionPool: getNextAccount(),
       optionAccount: getNextAccount(),
       underlyingMint: getNextAccount(),
+      collateralMint: getNextAccount(),
       positionAccount: getNextAccount(),
       collateralVault: getNextAccount(),
       buyerPaymentAccount: getNextAccount(),
@@ -741,8 +686,6 @@ export function parseAutoExerciseExpiredInstruction<
       slotHashesSysvar: getNextAccount(),
       instructionsSysvar: getNextAccount(),
       marketData: getNextAccount(),
-      omlpVault: getNextAccount(),
-      omlpVaultState: getNextAccount(),
       keeper: getNextAccount(),
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),