@epicentral/sos-sdk 0.11.2-beta → 0.12.1-beta

package/generated/instructions/closeLongToPool.ts

@@ -57,6 +57,7 @@ export type CloseLongToPoolInstruction<
   TAccountOptionAccount extends string | AccountMeta<string> = string,
   TAccountCollateralPool extends string | AccountMeta<string> = string,
   TAccountUnderlyingMint extends string | AccountMeta<string> = string,
+  TAccountCollateralMint extends string | AccountMeta<string> = string,
   TAccountLongMint extends string | AccountMeta<string> = string,
   TAccountEscrowLongAccount extends string | AccountMeta<string> = string,
   TAccountPremiumVault extends string | AccountMeta<string> = string,
@@ -69,6 +70,8 @@ export type CloseLongToPoolInstruction<
   TAccountBuyerPosition extends string | AccountMeta<string> = string,
   TAccountBuyerLongAccount extends string | AccountMeta<string> = string,
   TAccountBuyerPayoutAccount extends string | AccountMeta<string> = string,
+  TAccountBuyerUnderlyingPayoutAccount extends string | AccountMeta<string> =
+    string,
   TAccountCollateralVault extends string | AccountMeta<string> = string,
   TAccountBuyer extends string | AccountMeta<string> = string,
   TAccountTokenProgram extends string | AccountMeta<string> =
@@ -92,6 +95,9 @@ export type CloseLongToPoolInstruction<
       TAccountUnderlyingMint extends string
         ? ReadonlyAccount<TAccountUnderlyingMint>
         : TAccountUnderlyingMint,
+      TAccountCollateralMint extends string
+        ? ReadonlyAccount<TAccountCollateralMint>
+        : TAccountCollateralMint,
       TAccountLongMint extends string
         ? WritableAccount<TAccountLongMint>
         : TAccountLongMint,
@@ -122,6 +128,9 @@ export type CloseLongToPoolInstruction<
       TAccountBuyerPayoutAccount extends string
         ? WritableAccount<TAccountBuyerPayoutAccount>
         : TAccountBuyerPayoutAccount,
+      TAccountBuyerUnderlyingPayoutAccount extends string
+        ? WritableAccount<TAccountBuyerUnderlyingPayoutAccount>
+        : TAccountBuyerUnderlyingPayoutAccount,
       TAccountCollateralVault extends string
         ? WritableAccount<TAccountCollateralVault>
         : TAccountCollateralVault,
@@ -184,6 +193,7 @@ export type CloseLongToPoolAsyncInput<
   TAccountOptionAccount extends string = string,
   TAccountCollateralPool extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountLongMint extends string = string,
   TAccountEscrowLongAccount extends string = string,
   TAccountPremiumVault extends string = string,
@@ -194,6 +204,7 @@ export type CloseLongToPoolAsyncInput<
   TAccountBuyerPosition extends string = string,
   TAccountBuyerLongAccount extends string = string,
   TAccountBuyerPayoutAccount extends string = string,
+  TAccountBuyerUnderlyingPayoutAccount extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountBuyer extends string = string,
   TAccountTokenProgram extends string = string,
@@ -207,6 +218,8 @@ export type CloseLongToPoolAsyncInput<
   collateralPool?: Address<TAccountCollateralPool>;
   /** Underlying token mint (for decimal handling) */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  /** Collateral mint (settlement currency for collateral-vault payout leg) */
+  collateralMint: Address<TAccountCollateralMint>;
   /** LONG token mint (for transfer validation) */
   longMint: Address<TAccountLongMint>;
   /** Pool LONG escrow (destination when buyer closes back to pool) */
@@ -222,8 +235,10 @@ export type CloseLongToPoolAsyncInput<
   buyerPosition?: Address<TAccountBuyerPosition>;
   /** Buyer's LONG token account (source of tokens to return) */
   buyerLongAccount: Address<TAccountBuyerLongAccount>;
-  /** Buyer's underlying token account (receives payout) */
+  /** Buyer's settlement token account (receives collateral-vault payout leg) */
   buyerPayoutAccount: Address<TAccountBuyerPayoutAccount>;
+  /** Buyer's underlying token account (receives premium-vault payout leg; same ATA when physical) */
+  buyerUnderlyingPayoutAccount: Address<TAccountBuyerUnderlyingPayoutAccount>;
   /** Collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
   buyer: TransactionSigner<TAccountBuyer>;
@@ -238,6 +253,7 @@ export async function getCloseLongToPoolInstructionAsync<
   TAccountOptionAccount extends string,
   TAccountCollateralPool extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountLongMint extends string,
   TAccountEscrowLongAccount extends string,
   TAccountPremiumVault extends string,
@@ -248,6 +264,7 @@ export async function getCloseLongToPoolInstructionAsync<
   TAccountBuyerPosition extends string,
   TAccountBuyerLongAccount extends string,
   TAccountBuyerPayoutAccount extends string,
+  TAccountBuyerUnderlyingPayoutAccount extends string,
   TAccountCollateralVault extends string,
   TAccountBuyer extends string,
   TAccountTokenProgram extends string,
@@ -259,6 +276,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountOptionAccount,
     TAccountCollateralPool,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountLongMint,
     TAccountEscrowLongAccount,
     TAccountPremiumVault,
@@ -269,6 +287,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountBuyerPosition,
     TAccountBuyerLongAccount,
     TAccountBuyerPayoutAccount,
+    TAccountBuyerUnderlyingPayoutAccount,
     TAccountCollateralVault,
     TAccountBuyer,
     TAccountTokenProgram,
@@ -282,6 +301,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountOptionAccount,
     TAccountCollateralPool,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountLongMint,
     TAccountEscrowLongAccount,
     TAccountPremiumVault,
@@ -292,6 +312,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountBuyerPosition,
     TAccountBuyerLongAccount,
     TAccountBuyerPayoutAccount,
+    TAccountBuyerUnderlyingPayoutAccount,
     TAccountCollateralVault,
     TAccountBuyer,
     TAccountTokenProgram,
@@ -308,6 +329,7 @@ export async function getCloseLongToPoolInstructionAsync<
     optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
     underlyingMint: { value: input.underlyingMint ?? null, isWritable: false },
+    collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     longMint: { value: input.longMint ?? null, isWritable: true },
     escrowLongAccount: {
       value: input.escrowLongAccount ?? null,
@@ -336,6 +358,10 @@ export async function getCloseLongToPoolInstructionAsync<
       value: input.buyerPayoutAccount ?? null,
       isWritable: true,
     },
+    buyerUnderlyingPayoutAccount: {
+      value: input.buyerUnderlyingPayoutAccount ?? null,
+      isWritable: true,
+    },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     buyer: { value: input.buyer ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
@@ -400,6 +426,7 @@ export async function getCloseLongToPoolInstructionAsync<
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.longMint),
       getAccountMeta(accounts.escrowLongAccount),
       getAccountMeta(accounts.premiumVault),
@@ -410,6 +437,7 @@ export async function getCloseLongToPoolInstructionAsync<
       getAccountMeta(accounts.buyerPosition),
       getAccountMeta(accounts.buyerLongAccount),
       getAccountMeta(accounts.buyerPayoutAccount),
+      getAccountMeta(accounts.buyerUnderlyingPayoutAccount),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.buyer),
       getAccountMeta(accounts.tokenProgram),
@@ -425,6 +453,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountOptionAccount,
     TAccountCollateralPool,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountLongMint,
     TAccountEscrowLongAccount,
     TAccountPremiumVault,
@@ -435,6 +464,7 @@ export async function getCloseLongToPoolInstructionAsync<
     TAccountBuyerPosition,
     TAccountBuyerLongAccount,
     TAccountBuyerPayoutAccount,
+    TAccountBuyerUnderlyingPayoutAccount,
     TAccountCollateralVault,
     TAccountBuyer,
     TAccountTokenProgram,
@@ -447,6 +477,7 @@ export type CloseLongToPoolInput<
   TAccountOptionAccount extends string = string,
   TAccountCollateralPool extends string = string,
   TAccountUnderlyingMint extends string = string,
+  TAccountCollateralMint extends string = string,
   TAccountLongMint extends string = string,
   TAccountEscrowLongAccount extends string = string,
   TAccountPremiumVault extends string = string,
@@ -457,6 +488,7 @@ export type CloseLongToPoolInput<
   TAccountBuyerPosition extends string = string,
   TAccountBuyerLongAccount extends string = string,
   TAccountBuyerPayoutAccount extends string = string,
+  TAccountBuyerUnderlyingPayoutAccount extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountBuyer extends string = string,
   TAccountTokenProgram extends string = string,
@@ -470,6 +502,8 @@ export type CloseLongToPoolInput<
   collateralPool: Address<TAccountCollateralPool>;
   /** Underlying token mint (for decimal handling) */
   underlyingMint: Address<TAccountUnderlyingMint>;
+  /** Collateral mint (settlement currency for collateral-vault payout leg) */
+  collateralMint: Address<TAccountCollateralMint>;
   /** LONG token mint (for transfer validation) */
   longMint: Address<TAccountLongMint>;
   /** Pool LONG escrow (destination when buyer closes back to pool) */
@@ -485,8 +519,10 @@ export type CloseLongToPoolInput<
   buyerPosition: Address<TAccountBuyerPosition>;
   /** Buyer's LONG token account (source of tokens to return) */
   buyerLongAccount: Address<TAccountBuyerLongAccount>;
-  /** Buyer's underlying token account (receives payout) */
+  /** Buyer's settlement token account (receives collateral-vault payout leg) */
   buyerPayoutAccount: Address<TAccountBuyerPayoutAccount>;
+  /** Buyer's underlying token account (receives premium-vault payout leg; same ATA when physical) */
+  buyerUnderlyingPayoutAccount: Address<TAccountBuyerUnderlyingPayoutAccount>;
   /** Collateral vault (source of payout) */
   collateralVault: Address<TAccountCollateralVault>;
   buyer: TransactionSigner<TAccountBuyer>;
@@ -501,6 +537,7 @@ export function getCloseLongToPoolInstruction<
   TAccountOptionAccount extends string,
   TAccountCollateralPool extends string,
   TAccountUnderlyingMint extends string,
+  TAccountCollateralMint extends string,
   TAccountLongMint extends string,
   TAccountEscrowLongAccount extends string,
   TAccountPremiumVault extends string,
@@ -511,6 +548,7 @@ export function getCloseLongToPoolInstruction<
   TAccountBuyerPosition extends string,
   TAccountBuyerLongAccount extends string,
   TAccountBuyerPayoutAccount extends string,
+  TAccountBuyerUnderlyingPayoutAccount extends string,
   TAccountCollateralVault extends string,
   TAccountBuyer extends string,
   TAccountTokenProgram extends string,
@@ -522,6 +560,7 @@ export function getCloseLongToPoolInstruction<
     TAccountOptionAccount,
     TAccountCollateralPool,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountLongMint,
     TAccountEscrowLongAccount,
     TAccountPremiumVault,
@@ -532,6 +571,7 @@ export function getCloseLongToPoolInstruction<
     TAccountBuyerPosition,
     TAccountBuyerLongAccount,
     TAccountBuyerPayoutAccount,
+    TAccountBuyerUnderlyingPayoutAccount,
     TAccountCollateralVault,
     TAccountBuyer,
     TAccountTokenProgram,
@@ -544,6 +584,7 @@ export function getCloseLongToPoolInstruction<
   TAccountOptionAccount,
   TAccountCollateralPool,
   TAccountUnderlyingMint,
+  TAccountCollateralMint,
   TAccountLongMint,
   TAccountEscrowLongAccount,
   TAccountPremiumVault,
@@ -554,6 +595,7 @@ export function getCloseLongToPoolInstruction<
   TAccountBuyerPosition,
   TAccountBuyerLongAccount,
   TAccountBuyerPayoutAccount,
+  TAccountBuyerUnderlyingPayoutAccount,
   TAccountCollateralVault,
   TAccountBuyer,
   TAccountTokenProgram,
@@ -569,6 +611,7 @@ export function getCloseLongToPoolInstruction<
     optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
     underlyingMint: { value: input.underlyingMint ?? null, isWritable: false },
+    collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     longMint: { value: input.longMint ?? null, isWritable: true },
     escrowLongAccount: {
       value: input.escrowLongAccount ?? null,
@@ -597,6 +640,10 @@ export function getCloseLongToPoolInstruction<
       value: input.buyerPayoutAccount ?? null,
       isWritable: true,
     },
+    buyerUnderlyingPayoutAccount: {
+      value: input.buyerUnderlyingPayoutAccount ?? null,
+      isWritable: true,
+    },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     buyer: { value: input.buyer ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
@@ -635,6 +682,7 @@ export function getCloseLongToPoolInstruction<
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.underlyingMint),
+      getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.longMint),
       getAccountMeta(accounts.escrowLongAccount),
       getAccountMeta(accounts.premiumVault),
@@ -645,6 +693,7 @@ export function getCloseLongToPoolInstruction<
       getAccountMeta(accounts.buyerPosition),
       getAccountMeta(accounts.buyerLongAccount),
       getAccountMeta(accounts.buyerPayoutAccount),
+      getAccountMeta(accounts.buyerUnderlyingPayoutAccount),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.buyer),
       getAccountMeta(accounts.tokenProgram),
@@ -660,6 +709,7 @@ export function getCloseLongToPoolInstruction<
     TAccountOptionAccount,
     TAccountCollateralPool,
     TAccountUnderlyingMint,
+    TAccountCollateralMint,
     TAccountLongMint,
     TAccountEscrowLongAccount,
     TAccountPremiumVault,
@@ -670,6 +720,7 @@ export function getCloseLongToPoolInstruction<
     TAccountBuyerPosition,
     TAccountBuyerLongAccount,
     TAccountBuyerPayoutAccount,
+    TAccountBuyerUnderlyingPayoutAccount,
     TAccountCollateralVault,
     TAccountBuyer,
     TAccountTokenProgram,
@@ -691,28 +742,32 @@ export type ParsedCloseLongToPoolInstruction<
     collateralPool: TAccountMetas[2];
     /** Underlying token mint (for decimal handling) */
     underlyingMint: TAccountMetas[3];
+    /** Collateral mint (settlement currency for collateral-vault payout leg) */
+    collateralMint: TAccountMetas[4];
     /** LONG token mint (for transfer validation) */
-    longMint: TAccountMetas[4];
+    longMint: TAccountMetas[5];
     /** Pool LONG escrow (destination when buyer closes back to pool) */
-    escrowLongAccount: TAccountMetas[5];
+    escrowLongAccount: TAccountMetas[6];
     /** Premium vault (first source of buyer payout) */
-    premiumVault: TAccountMetas[6];
+    premiumVault: TAccountMetas[7];
     /** Market data account (provides risk-free rate and switchboard_feed_id) */
-    marketData: TAccountMetas[7];
-    switchboardQueue: TAccountMetas[8];
-    slotHashesSysvar: TAccountMetas[9];
-    instructionsSysvar: TAccountMetas[10];
+    marketData: TAccountMetas[8];
+    switchboardQueue: TAccountMetas[9];
+    slotHashesSysvar: TAccountMetas[10];
+    instructionsSysvar: TAccountMetas[11];
     /** Buyer's position account */
-    buyerPosition: TAccountMetas[11];
+    buyerPosition: TAccountMetas[12];
     /** Buyer's LONG token account (source of tokens to return) */
-    buyerLongAccount: TAccountMetas[12];
-    /** Buyer's underlying token account (receives payout) */
-    buyerPayoutAccount: TAccountMetas[13];
+    buyerLongAccount: TAccountMetas[13];
+    /** Buyer's settlement token account (receives collateral-vault payout leg) */
+    buyerPayoutAccount: TAccountMetas[14];
+    /** Buyer's underlying token account (receives premium-vault payout leg; same ATA when physical) */
+    buyerUnderlyingPayoutAccount: TAccountMetas[15];
     /** Collateral vault (source of payout) */
-    collateralVault: TAccountMetas[14];
-    buyer: TAccountMetas[15];
-    tokenProgram: TAccountMetas[16];
-    systemProgram: TAccountMetas[17];
+    collateralVault: TAccountMetas[16];
+    buyer: TAccountMetas[17];
+    tokenProgram: TAccountMetas[18];
+    systemProgram: TAccountMetas[19];
   };
   data: CloseLongToPoolInstructionData;
 };
@@ -725,7 +780,7 @@ export function parseCloseLongToPoolInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>,
 ): ParsedCloseLongToPoolInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 18) {
+  if (instruction.accounts.length < 20) {
     // TODO: Coded error.
     throw new Error("Not enough accounts");
   }
@@ -742,6 +797,7 @@ export function parseCloseLongToPoolInstruction<
       optionAccount: getNextAccount(),
       collateralPool: getNextAccount(),
       underlyingMint: getNextAccount(),
+      collateralMint: getNextAccount(),
       longMint: getNextAccount(),
       escrowLongAccount: getNextAccount(),
       premiumVault: getNextAccount(),
@@ -752,6 +808,7 @@ export function parseCloseLongToPoolInstruction<
       buyerPosition: getNextAccount(),
       buyerLongAccount: getNextAccount(),
       buyerPayoutAccount: getNextAccount(),
+      buyerUnderlyingPayoutAccount: getNextAccount(),
       collateralVault: getNextAccount(),
       buyer: getNextAccount(),
       tokenProgram: getNextAccount(),

package/generated/instructions/optionMint.ts

@@ -350,7 +350,7 @@ export type OptionMintAsyncInput<
   optionPool?: Address<TAccountOptionPool>;
   /** Pool's escrow for holding LONG tokens (for buyers to purchase) */
   escrowLongAccount?: Address<TAccountEscrowLongAccount>;
-  /** Pool's vault for collecting premiums (in underlying asset) */
+  /** Pool vault for premiums (underlying when physical, collateral mint for cash) */
   premiumVault?: Address<TAccountPremiumVault>;
   /** Collateral pool for this option */
   collateralPool?: Address<TAccountCollateralPool>;
@@ -707,7 +707,7 @@ export async function getOptionMintInstructionAsync<
           ]),
         ),
         getAddressEncoder().encode(
-          expectAddress(accounts.underlyingMint.value),
+          expectAddress(accounts.collateralMint.value),
         ),
       ],
     });
@@ -924,7 +924,7 @@ export type OptionMintInput<
   optionPool: Address<TAccountOptionPool>;
   /** Pool's escrow for holding LONG tokens (for buyers to purchase) */
   escrowLongAccount: Address<TAccountEscrowLongAccount>;
-  /** Pool's vault for collecting premiums (in underlying asset) */
+  /** Pool vault for premiums (underlying when physical, collateral mint for cash) */
   premiumVault: Address<TAccountPremiumVault>;
   /** Collateral pool for this option */
   collateralPool: Address<TAccountCollateralPool>;
@@ -1278,7 +1278,7 @@ export type ParsedOptionMintInstruction<
     optionPool: TAccountMetas[11];
     /** Pool's escrow for holding LONG tokens (for buyers to purchase) */
     escrowLongAccount: TAccountMetas[12];
-    /** Pool's vault for collecting premiums (in underlying asset) */
+    /** Pool vault for premiums (underlying when physical, collateral mint for cash) */
     premiumVault: TAccountMetas[13];
     /** Collateral pool for this option */
     collateralPool: TAccountMetas[14];

package/generated/instructions/unwindWriterUnsold.ts

@@ -222,9 +222,9 @@ export type UnwindWriterUnsoldAsyncInput<
    */
   premiumVault: Address<TAccountPremiumVault>;
   /**
-   * Writer's token account for returned collateral + any leftover theta.
-   * Must be the underlying_mint so leftover theta (denominated in
-   * premium_vault.mint == underlying_mint) can be deposited here.
+   * Writer's token account for returned collateral (collateral_pool mint).
+   * Leftover theta from premium_vault is only transferred here when
+   * premium_vault.mint matches this account (physical settlement).
    */
   writerCollateralAccount: Address<TAccountWriterCollateralAccount>;
   /** OMLP Vault state PDA (for total_loans, add_interest_to_index) - optional, required when repaying loans */
@@ -480,9 +480,9 @@ export type UnwindWriterUnsoldInput<
    */
   premiumVault: Address<TAccountPremiumVault>;
   /**
-   * Writer's token account for returned collateral + any leftover theta.
-   * Must be the underlying_mint so leftover theta (denominated in
-   * premium_vault.mint == underlying_mint) can be deposited here.
+   * Writer's token account for returned collateral (collateral_pool mint).
+   * Leftover theta from premium_vault is only transferred here when
+   * premium_vault.mint matches this account (physical settlement).
    */
   writerCollateralAccount: Address<TAccountWriterCollateralAccount>;
   /** OMLP Vault state PDA (for total_loans, add_interest_to_index) - optional, required when repaying loans */
@@ -693,9 +693,9 @@ export type ParsedUnwindWriterUnsoldInstruction<
      */
     premiumVault: TAccountMetas[10];
     /**
-     * Writer's token account for returned collateral + any leftover theta.
-     * Must be the underlying_mint so leftover theta (denominated in
-     * premium_vault.mint == underlying_mint) can be deposited here.
+     * Writer's token account for returned collateral (collateral_pool mint).
+     * Leftover theta from premium_vault is only transferred here when
+     * premium_vault.mint matches this account (physical settlement).
      */
     writerCollateralAccount: TAccountMetas[11];
     /** OMLP Vault state PDA (for total_loans, add_interest_to_index) - optional, required when repaying loans */