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

package/generated/instructions/autoExerciseAllExpired.ts

@@ -57,9 +57,8 @@ export type AutoExerciseAllExpiredInstruction<
   TAccountOptionPool extends string | AccountMeta<string> = string,
   TAccountOptionAccount extends string | AccountMeta<string> = string,
   TAccountUnderlyingMint extends string | AccountMeta<string> = string,
+  TAccountCollateralMint extends string | AccountMeta<string> = string,
   TAccountCollateralVault extends string | AccountMeta<string> = string,
-  TAccountOmlpVault extends string | AccountMeta<string> = string,
-  TAccountOmlpVaultState extends string | AccountMeta<string> = string,
   TAccountOptionMint extends string | AccountMeta<string> = string,
   TAccountSwitchboardQueue extends string | AccountMeta<string> = string,
   TAccountSlotHashesSysvar extends string | AccountMeta<string> =
@@ -89,15 +88,12 @@ export type AutoExerciseAllExpiredInstruction<
       TAccountUnderlyingMint extends string
         ? ReadonlyAccount<TAccountUnderlyingMint>
         : TAccountUnderlyingMint,
+      TAccountCollateralMint extends string
+        ? ReadonlyAccount<TAccountCollateralMint>
+        : TAccountCollateralMint,
       TAccountCollateralVault extends string
         ? WritableAccount<TAccountCollateralVault>
         : TAccountCollateralVault,
-      TAccountOmlpVault extends string
-        ? WritableAccount<TAccountOmlpVault>
-        : TAccountOmlpVault,
-      TAccountOmlpVaultState extends string
-        ? WritableAccount<TAccountOmlpVaultState>
-        : TAccountOmlpVaultState,
       TAccountOptionMint extends string
         ? WritableAccount<TAccountOptionMint>
         : TAccountOptionMint,
@@ -171,9 +167,8 @@ export type AutoExerciseAllExpiredAsyncInput<
   TAccountOptionPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountCollateralVault extends string = string,
-  TAccountOmlpVault extends string = string,
-  TAccountOmlpVaultState extends string = string,
   TAccountOptionMint extends string = string,
   TAccountSwitchboardQueue extends string = string,
   TAccountSlotHashesSysvar extends string = string,
@@ -191,17 +186,9 @@ export type AutoExerciseAllExpiredAsyncInput<
    * state PDA and to keep vault aggregates consistent across batches.
    */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  collateralMint: Address<TAccountCollateralMint>;
   /** Pool's collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
-  /** OMLP Vault token account to receive repayments */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: `total_loans`, `total_liquidity`,
-   * `acc_interest_per_share_fp`). One vault state is used for the whole
-   * batch — batch auto-exercise only repays lenders in the underlying
-   * mint of the option.
-   */
-  omlpVaultState?: Address<TAccountOmlpVaultState>;
   /** Option mint (for burning) */
   optionMint: Address<TAccountOptionMint>;
   switchboardQueue: Address<TAccountSwitchboardQueue>;
@@ -221,9 +208,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
   TAccountOptionPool extends string,
   TAccountOptionAccount extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountCollateralVault extends string,
-  TAccountOmlpVault extends string,
-  TAccountOmlpVaultState extends string,
   TAccountOptionMint extends string,
   TAccountSwitchboardQueue extends string,
   TAccountSlotHashesSysvar extends string,
@@ -239,9 +225,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountCollateralVault,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountOptionMint,
     TAccountSwitchboardQueue,
     TAccountSlotHashesSysvar,
@@ -259,9 +244,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountCollateralVault,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountOptionMint,
     TAccountSwitchboardQueue,
     TAccountSlotHashesSysvar,
@@ -282,9 +266,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
     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 },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
-    omlpVault: { value: input.omlpVault ?? null, isWritable: true },
-    omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     optionMint: { value: input.optionMint ?? null, isWritable: true },
     switchboardQueue: {
       value: input.switchboardQueue ?? null,
@@ -326,17 +309,6 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
       ],
     });
   }
-  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.slotHashesSysvar.value) {
     accounts.slotHashesSysvar.value =
       "SysvarS1otHashes111111111111111111111111111" as Address<"SysvarS1otHashes111111111111111111111111111">;
@@ -361,9 +333,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.collateralVault),
-      getAccountMeta(accounts.omlpVault),
-      getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.optionMint),
       getAccountMeta(accounts.switchboardQueue),
       getAccountMeta(accounts.slotHashesSysvar),
@@ -383,9 +354,8 @@ export async function getAutoExerciseAllExpiredInstructionAsync<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountCollateralVault,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountOptionMint,
     TAccountSwitchboardQueue,
     TAccountSlotHashesSysvar,
@@ -402,9 +372,8 @@ export type AutoExerciseAllExpiredInput<
   TAccountOptionPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountCollateralVault extends string = string,
-  TAccountOmlpVault extends string = string,
-  TAccountOmlpVaultState extends string = string,
   TAccountOptionMint extends string = string,
   TAccountSwitchboardQueue extends string = string,
   TAccountSlotHashesSysvar extends string = string,
@@ -422,17 +391,9 @@ export type AutoExerciseAllExpiredInput<
    * state PDA and to keep vault aggregates consistent across batches.
    */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  collateralMint: Address<TAccountCollateralMint>;
   /** Pool's collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
-  /** OMLP Vault token account to receive repayments */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: `total_loans`, `total_liquidity`,
-   * `acc_interest_per_share_fp`). One vault state is used for the whole
-   * batch — batch auto-exercise only repays lenders in the underlying
-   * mint of the option.
-   */
-  omlpVaultState: Address<TAccountOmlpVaultState>;
   /** Option mint (for burning) */
   optionMint: Address<TAccountOptionMint>;
   switchboardQueue: Address<TAccountSwitchboardQueue>;
@@ -452,9 +413,8 @@ export function getAutoExerciseAllExpiredInstruction<
   TAccountOptionPool extends string,
   TAccountOptionAccount extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountCollateralVault extends string,
-  TAccountOmlpVault extends string,
-  TAccountOmlpVaultState extends string,
   TAccountOptionMint extends string,
   TAccountSwitchboardQueue extends string,
   TAccountSlotHashesSysvar extends string,
@@ -470,9 +430,8 @@ export function getAutoExerciseAllExpiredInstruction<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountCollateralVault,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountOptionMint,
     TAccountSwitchboardQueue,
     TAccountSlotHashesSysvar,
@@ -489,9 +448,8 @@ export function getAutoExerciseAllExpiredInstruction<
   TAccountOptionPool,
   TAccountOptionAccount,
   TAccountUnderlyingMint,
+  TAccountCollateralMint,
   TAccountCollateralVault,
-  TAccountOmlpVault,
-  TAccountOmlpVaultState,
   TAccountOptionMint,
   TAccountSwitchboardQueue,
   TAccountSlotHashesSysvar,
@@ -511,9 +469,8 @@ export function getAutoExerciseAllExpiredInstruction<
     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 },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
-    omlpVault: { value: input.omlpVault ?? null, isWritable: true },
-    omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     optionMint: { value: input.optionMint ?? null, isWritable: true },
     switchboardQueue: {
       value: input.switchboardQueue ?? null,
@@ -565,9 +522,8 @@ export function getAutoExerciseAllExpiredInstruction<
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.collateralVault),
-      getAccountMeta(accounts.omlpVault),
-      getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.optionMint),
       getAccountMeta(accounts.switchboardQueue),
       getAccountMeta(accounts.slotHashesSysvar),
@@ -587,9 +543,8 @@ export function getAutoExerciseAllExpiredInstruction<
     TAccountOptionPool,
     TAccountOptionAccount,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountCollateralVault,
-    TAccountOmlpVault,
-    TAccountOmlpVaultState,
     TAccountOptionMint,
     TAccountSwitchboardQueue,
     TAccountSlotHashesSysvar,
@@ -615,28 +570,20 @@ export type ParsedAutoExerciseAllExpiredInstruction<
      * state PDA and to keep vault aggregates consistent across batches.
      */
     underlyingMint: TAccountMetas[3];
+    collateralMint: TAccountMetas[4];
     /** Pool's collateral vault (source of payout) */
-    collateralVault: TAccountMetas[4];
-    /** OMLP Vault token account to receive repayments */
-    omlpVault: TAccountMetas[5];
-    /**
-     * OMLP Vault state PDA (mut: `total_loans`, `total_liquidity`,
-     * `acc_interest_per_share_fp`). One vault state is used for the whole
-     * batch — batch auto-exercise only repays lenders in the underlying
-     * mint of the option.
-     */
-    omlpVaultState: TAccountMetas[6];
+    collateralVault: TAccountMetas[5];
     /** Option mint (for burning) */
-    optionMint: TAccountMetas[7];
-    switchboardQueue: TAccountMetas[8];
-    slotHashesSysvar: TAccountMetas[9];
-    instructionsSysvar: TAccountMetas[10];
+    optionMint: TAccountMetas[6];
+    switchboardQueue: TAccountMetas[7];
+    slotHashesSysvar: TAccountMetas[8];
+    instructionsSysvar: TAccountMetas[9];
     /** Market data for this underlying asset (contains switchboard_feed_id) */
-    marketData: TAccountMetas[11];
+    marketData: TAccountMetas[10];
     /** Keeper who pays for gas - anyone can call this after expiration */
-    keeper: TAccountMetas[12];
-    tokenProgram: TAccountMetas[13];
-    systemProgram: TAccountMetas[14];
+    keeper: TAccountMetas[11];
+    tokenProgram: TAccountMetas[12];
+    systemProgram: TAccountMetas[13];
   };
   data: AutoExerciseAllExpiredInstructionData;
 };
@@ -649,7 +596,7 @@ export function parseAutoExerciseAllExpiredInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>,
 ): ParsedAutoExerciseAllExpiredInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 15) {
+  if (instruction.accounts.length < 14) {
     // TODO: Coded error.
     throw new Error("Not enough accounts");
   }
@@ -666,9 +613,8 @@ export function parseAutoExerciseAllExpiredInstruction<
       optionPool: getNextAccount(),
       optionAccount: getNextAccount(),
       underlyingMint: getNextAccount(),
+      collateralMint: getNextAccount(),
       collateralVault: getNextAccount(),
-      omlpVault: getNextAccount(),
-      omlpVaultState: getNextAccount(),
       optionMint: getNextAccount(),
       switchboardQueue: getNextAccount(),
       slotHashesSysvar: getNextAccount(),