@epicentral/sos-sdk 0.9.0-beta → 0.10.0-beta

package/README.md

@@ -63,7 +63,8 @@ Additional modules:
 | `buildUnwindWriterUnsoldTransactionWithDerivation` | Builds unwind unsold transaction. |
 | `buildUnwindWriterUnsoldWithLoanRepayment` | **Unwind + repay pool loans in one tx.** Use when closing unsold shorts that borrowed from OMLP. |
 | `buildSyncWriterPositionTransaction` | Syncs writer position with pool accumulators. |
-| `buildSettleMakerCollateralTransaction` | Settles maker collateral after buyer closes (repays principal + accrued interest to OMLP from collateral vault first, then returns remainder to maker). |
+| `buildSettleMakerCollateralTransaction` | Expiry Phase A: repays one active loan's principal + accrued interest to OMLP from collateral vault. Writers with multiple loans for the expired option call it once per loan; maker residual is claimed separately. |
+| `getClaimMakerRemainingInstructionAsync` | Expiry Phase C generated instruction: returns remaining maker collateral after Phase B buyer payouts complete. |
 | `buildCloseOptionTransaction` | Closes option token account. |
 | `buildClaimThetaTransaction` | Claims theta (time-decay share) for writer. |
 | `buildRepayPoolLoanFromCollateralInstruction` | Repays pool loan from collateral (short/pool). |
@@ -77,8 +78,19 @@ Additional modules:
   - On-chain transfers for lender repayment and collateral return are authorized by program PDAs (`collateral_pool` / `option_pool`) where applicable.
 - `buildSettleMakerCollateralTransaction`
   - No maker transaction signer is required by this instruction format.
-  - On-chain repayment (`collateral_vault` -> `omlp_vault`) and maker return are signed by the `collateral_pool` PDA.
+  - On-chain repayment (`collateral_vault` -> `omlp_vault`) is signed by the `collateral_pool` PDA.
   - Lender repayment is sourced from collateral vault funds, not maker wallet funds.
+  - Expiry residual maker collateral is returned later by `claim_maker_remaining` after buyer payout Phase B.
+
+### Expiry Settlement
+
+Expiry settlement is lender-first and split across three instructions:
+
+1. `settle_maker_collateral` (Phase A) for every non-liquidated maker. Lender repayment is paid to the loan vault's ATA for the pool collateral mint, so devnet fake SOL/USDC pools and mainnet WSOL pools use the same mint-safe path. If a writer has multiple active `PoolLoan` accounts for that expired option, keepers submit one Phase A transaction per loan; the maker share is not marked Phase A settled until all are repaid.
+2. `auto_exercise_expired` / `auto_exercise_all_expired` (Phase B) for buyers, capped by `eligible_maker_pot`; options with zero buyer positions are considered buyer-settled so maker claims do not stall. The single and batch paths take the collateral/settlement mint so cash-settled payouts use the correct token decimals; batch remaining accounts must pair each position with that buyer's token account for the same mint.
+3. `claim_maker_remaining` (Phase C) for makers after `phase_b_complete`, returning residual collateral in the pool collateral mint.
+
+New program errors exposed in the IDL: `LenderRepaymentNotComplete`, `BuyerPayoutNotComplete`, and `MakerLiquidated`.
 
 ### OMLP (Lending)
 

package/accounts/fetchers.ts

@@ -43,34 +43,7 @@ async function decodeAccount<T>(
 ): Promise<T | null> {
   const data = await fetchRawAccount(rpc, address);
   if (!data) return null;
-  try {
-    return decoder.decode(data);
-  } catch (e) {
-    // #region agent log
-    try {
-      fetch("http://127.0.0.1:7586/ingest/4a07cb33-954d-4b27-b1a3-08f1423b9d05", {
-        method: "POST",
-        headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "af65cf" },
-        body: JSON.stringify({
-          sessionId: "af65cf",
-          location: "sos-sdk/accounts/fetchers.ts:decodeAccount",
-          message: "decode_throw",
-          data: {
-            address: String(address),
-            dataLen: data.length,
-            firstDiscHex: Array.from(data.slice(0, 8))
-              .map((b) => b.toString(16).padStart(2, "0"))
-              .join(""),
-            err: (e as Error)?.message ?? String(e),
-          },
-          timestamp: Date.now(),
-          hypothesisId: "H2-i64-account-size-mismatch",
-        }),
-      }).catch(() => {});
-    } catch {}
-    // #endregion
-    throw e;
-  }
+  return decoder.decode(data);
 }
 
 export async function fetchOptionAccount(

package/generated/accounts/collateralPool.ts

@@ -70,6 +70,13 @@ export type CollateralPool = {
   makerCount: number;
   isExercised: boolean;
   isFullySettled: boolean;
+  phaseAComplete: boolean;
+  phaseBComplete: boolean;
+  eligibleMakerPot: bigint;
+  remainingMakerPostDebtCollateral: bigint;
+  eligibleMakerCount: number;
+  makersPhaseASettled: number;
+  totalBuyerIntrinsicOwedSnapshot: bigint;
   createdAt: bigint;
   lastUpdated: bigint;
   bump: number;
@@ -89,6 +96,13 @@ export type CollateralPoolArgs = {
   makerCount: number;
   isExercised: boolean;
   isFullySettled: boolean;
+  phaseAComplete: boolean;
+  phaseBComplete: boolean;
+  eligibleMakerPot: number | bigint;
+  remainingMakerPostDebtCollateral: number | bigint;
+  eligibleMakerCount: number;
+  makersPhaseASettled: number;
+  totalBuyerIntrinsicOwedSnapshot: number | bigint;
   createdAt: number | bigint;
   lastUpdated: number | bigint;
   bump: number;
@@ -112,6 +126,13 @@ export function getCollateralPoolEncoder(): FixedSizeEncoder<CollateralPoolArgs>
       ["makerCount", getU32Encoder()],
       ["isExercised", getBooleanEncoder()],
       ["isFullySettled", getBooleanEncoder()],
+      ["phaseAComplete", getBooleanEncoder()],
+      ["phaseBComplete", getBooleanEncoder()],
+      ["eligibleMakerPot", getU64Encoder()],
+      ["remainingMakerPostDebtCollateral", getU64Encoder()],
+      ["eligibleMakerCount", getU32Encoder()],
+      ["makersPhaseASettled", getU32Encoder()],
+      ["totalBuyerIntrinsicOwedSnapshot", getU64Encoder()],
       ["createdAt", getI64Encoder()],
       ["lastUpdated", getI64Encoder()],
       ["bump", getU8Encoder()],
@@ -137,6 +158,13 @@ export function getCollateralPoolDecoder(): FixedSizeDecoder<CollateralPool> {
     ["makerCount", getU32Decoder()],
     ["isExercised", getBooleanDecoder()],
     ["isFullySettled", getBooleanDecoder()],
+    ["phaseAComplete", getBooleanDecoder()],
+    ["phaseBComplete", getBooleanDecoder()],
+    ["eligibleMakerPot", getU64Decoder()],
+    ["remainingMakerPostDebtCollateral", getU64Decoder()],
+    ["eligibleMakerCount", getU32Decoder()],
+    ["makersPhaseASettled", getU32Decoder()],
+    ["totalBuyerIntrinsicOwedSnapshot", getU64Decoder()],
     ["createdAt", getI64Decoder()],
     ["lastUpdated", getI64Decoder()],
     ["bump", getU8Decoder()],
@@ -213,5 +241,5 @@ export async function fetchAllMaybeCollateralPool(
 }
 
 export function getCollateralPoolSize(): number {
-  return 183;
+  return 217;
 }

package/generated/accounts/makerCollateralShare.ts

@@ -65,7 +65,9 @@ export type MakerCollateralShare = {
   premiumCollected: bigint;
   exercisePayout: bigint;
   lenderRepayment: bigint;
+  postDebtCollateral: bigint;
   makerReturn: bigint;
+  phaseASettled: boolean;
   isSettled: boolean;
   realizedPnl: bigint;
   createdAt: bigint;
@@ -84,7 +86,9 @@ export type MakerCollateralShareArgs = {
   premiumCollected: number | bigint;
   exercisePayout: number | bigint;
   lenderRepayment: number | bigint;
+  postDebtCollateral: number | bigint;
   makerReturn: number | bigint;
+  phaseASettled: boolean;
   isSettled: boolean;
   realizedPnl: number | bigint;
   createdAt: number | bigint;
@@ -107,7 +111,9 @@ export function getMakerCollateralShareEncoder(): FixedSizeEncoder<MakerCollater
       ["premiumCollected", getU64Encoder()],
       ["exercisePayout", getU64Encoder()],
       ["lenderRepayment", getU64Encoder()],
+      ["postDebtCollateral", getU64Encoder()],
       ["makerReturn", getU64Encoder()],
+      ["phaseASettled", getBooleanEncoder()],
       ["isSettled", getBooleanEncoder()],
       ["realizedPnl", getI64Encoder()],
       ["createdAt", getI64Encoder()],
@@ -135,7 +141,9 @@ export function getMakerCollateralShareDecoder(): FixedSizeDecoder<MakerCollater
     ["premiumCollected", getU64Decoder()],
     ["exercisePayout", getU64Decoder()],
     ["lenderRepayment", getU64Decoder()],
+    ["postDebtCollateral", getU64Decoder()],
     ["makerReturn", getU64Decoder()],
+    ["phaseASettled", getBooleanDecoder()],
     ["isSettled", getBooleanDecoder()],
     ["realizedPnl", getI64Decoder()],
     ["createdAt", getI64Decoder()],
@@ -225,5 +233,5 @@ export async function fetchAllMaybeMakerCollateralShare(
 }
 
 export function getMakerCollateralShareSize(): number {
-  return 194;
+  return 203;
 }

package/generated/errors/optionProgram.ts

@@ -154,78 +154,84 @@ export const OPTION_PROGRAM_ERROR__COLLATERAL_POOL_NOT_FOUND = 0x17b3; // 6067
 export const OPTION_PROGRAM_ERROR__NO_COLLATERAL_TO_WITHDRAW = 0x17b4; // 6068
 /** OptionNotExpired: Option has not expired yet - cannot settle */
 export const OPTION_PROGRAM_ERROR__OPTION_NOT_EXPIRED = 0x17b5; // 6069
+/** LenderRepaymentNotComplete: Lender repayment phase is not complete */
+export const OPTION_PROGRAM_ERROR__LENDER_REPAYMENT_NOT_COMPLETE = 0x17b6; // 6070
+/** BuyerPayoutNotComplete: Buyer payout phase is not complete */
+export const OPTION_PROGRAM_ERROR__BUYER_PAYOUT_NOT_COMPLETE = 0x17b7; // 6071
+/** MakerLiquidated: Maker was liquidated and is excluded from expiry settlement */
+export const OPTION_PROGRAM_ERROR__MAKER_LIQUIDATED = 0x17b8; // 6072
 /** SupplyLimitExceeded: Deposit would exceed vault supply limit */
-export const OPTION_PROGRAM_ERROR__SUPPLY_LIMIT_EXCEEDED = 0x17b6; // 6070
+export const OPTION_PROGRAM_ERROR__SUPPLY_LIMIT_EXCEEDED = 0x17b9; // 6073
 /** InvalidFeeWallet: Invalid fee wallet - must match protocol constant */
-export const OPTION_PROGRAM_ERROR__INVALID_FEE_WALLET = 0x17b7; // 6071
+export const OPTION_PROGRAM_ERROR__INVALID_FEE_WALLET = 0x17ba; // 6074
 /** InvalidProtocolFee: Invalid protocol fee rate */
-export const OPTION_PROGRAM_ERROR__INVALID_PROTOCOL_FEE = 0x17b8; // 6072
+export const OPTION_PROGRAM_ERROR__INVALID_PROTOCOL_FEE = 0x17bb; // 6075
 /** UnderlyingAssetMismatch: Underlying asset mismatch - market data or mint does not match option */
-export const OPTION_PROGRAM_ERROR__UNDERLYING_ASSET_MISMATCH = 0x17b9; // 6073
+export const OPTION_PROGRAM_ERROR__UNDERLYING_ASSET_MISMATCH = 0x17bc; // 6076
 /** InvalidMint: Invalid token mint - does not match expected underlying asset */
-export const OPTION_PROGRAM_ERROR__INVALID_MINT = 0x17ba; // 6074
+export const OPTION_PROGRAM_ERROR__INVALID_MINT = 0x17bd; // 6077
 /** BatchSizeExceeded: Batch size exceeds maximum allowed (10 positions) */
-export const OPTION_PROGRAM_ERROR__BATCH_SIZE_EXCEEDED = 0x17bb; // 6075
+export const OPTION_PROGRAM_ERROR__BATCH_SIZE_EXCEEDED = 0x17be; // 6078
 /** NoPositionsProvided: No positions provided in batch */
-export const OPTION_PROGRAM_ERROR__NO_POSITIONS_PROVIDED = 0x17bc; // 6076
+export const OPTION_PROGRAM_ERROR__NO_POSITIONS_PROVIDED = 0x17bf; // 6079
 /** PositionOptionMismatch: Position account does not belong to this option */
-export const OPTION_PROGRAM_ERROR__POSITION_OPTION_MISMATCH = 0x17bd; // 6077
+export const OPTION_PROGRAM_ERROR__POSITION_OPTION_MISMATCH = 0x17c0; // 6080
 /** OptionPoolMismatch: Option account does not match the option pool's option account */
-export const OPTION_PROGRAM_ERROR__OPTION_POOL_MISMATCH = 0x17be; // 6078
+export const OPTION_PROGRAM_ERROR__OPTION_POOL_MISMATCH = 0x17c1; // 6081
 /** InvalidSeed: Invalid seed - must be exactly 32 bytes */
-export const OPTION_PROGRAM_ERROR__INVALID_SEED = 0x17bf; // 6079
+export const OPTION_PROGRAM_ERROR__INVALID_SEED = 0x17c2; // 6082
 /** InvalidAuthority: Invalid authority - does not match escrow authority */
-export const OPTION_PROGRAM_ERROR__INVALID_AUTHORITY = 0x17c0; // 6080
+export const OPTION_PROGRAM_ERROR__INVALID_AUTHORITY = 0x17c3; // 6083
 /** EscrowAccountRequired: Escrow accounts required when borrowed_amount > 0 */
-export const OPTION_PROGRAM_ERROR__ESCROW_ACCOUNT_REQUIRED = 0x17c1; // 6081
+export const OPTION_PROGRAM_ERROR__ESCROW_ACCOUNT_REQUIRED = 0x17c4; // 6084
 /** InvalidEscrowMaker: Escrow state maker does not match instruction maker */
-export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_MAKER = 0x17c2; // 6082
+export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_MAKER = 0x17c5; // 6085
 /** EscrowMintMismatch: Escrow collateral mint does not match collateral pool mint */
-export const OPTION_PROGRAM_ERROR__ESCROW_MINT_MISMATCH = 0x17c3; // 6083
+export const OPTION_PROGRAM_ERROR__ESCROW_MINT_MISMATCH = 0x17c6; // 6086
 /** InsufficientEscrowBalance: Insufficient balance in escrow token account */
-export const OPTION_PROGRAM_ERROR__INSUFFICIENT_ESCROW_BALANCE = 0x17c4; // 6084
+export const OPTION_PROGRAM_ERROR__INSUFFICIENT_ESCROW_BALANCE = 0x17c7; // 6087
 /** InvalidEscrowOwner: Escrow token account owner mismatch */
-export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_OWNER = 0x17c5; // 6085
+export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_OWNER = 0x17c8; // 6088
 /** InvalidEscrowMint: Escrow token account mint mismatch */
-export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_MINT = 0x17c6; // 6086
+export const OPTION_PROGRAM_ERROR__INVALID_ESCROW_MINT = 0x17c9; // 6089
 /** AccountFrozen: Token account is frozen and cannot be burned */
-export const OPTION_PROGRAM_ERROR__ACCOUNT_FROZEN = 0x17c7; // 6087
+export const OPTION_PROGRAM_ERROR__ACCOUNT_FROZEN = 0x17ca; // 6090
 /** InvalidAccount: Invalid account - does not match expected account */
-export const OPTION_PROGRAM_ERROR__INVALID_ACCOUNT = 0x17c8; // 6088
+export const OPTION_PROGRAM_ERROR__INVALID_ACCOUNT = 0x17cb; // 6091
 /** UnwindRepayAccountsMissing: Unwind repayment accounts are required when active pool loans exist */
-export const OPTION_PROGRAM_ERROR__UNWIND_REPAY_ACCOUNTS_MISSING = 0x17c9; // 6089
+export const OPTION_PROGRAM_ERROR__UNWIND_REPAY_ACCOUNTS_MISSING = 0x17cc; // 6092
 /** InsufficientCollateralVault: Collateral vault has insufficient funds for unwind collateral return */
-export const OPTION_PROGRAM_ERROR__INSUFFICIENT_COLLATERAL_VAULT = 0x17ca; // 6090
+export const OPTION_PROGRAM_ERROR__INSUFFICIENT_COLLATERAL_VAULT = 0x17cd; // 6093
 /** InvalidVaultMint: Invalid vault mint - does not match expected collateral mint */
-export const OPTION_PROGRAM_ERROR__INVALID_VAULT_MINT = 0x17cb; // 6091
+export const OPTION_PROGRAM_ERROR__INVALID_VAULT_MINT = 0x17ce; // 6094
 /** InvalidCollateralMint: Invalid collateral mint - not supported or no vault exists */
-export const OPTION_PROGRAM_ERROR__INVALID_COLLATERAL_MINT = 0x17cc; // 6092
+export const OPTION_PROGRAM_ERROR__INVALID_COLLATERAL_MINT = 0x17cf; // 6095
 /** CollateralMismatch: Collateral mint mismatch - position uses different collateral type */
-export const OPTION_PROGRAM_ERROR__COLLATERAL_MISMATCH = 0x17cd; // 6093
+export const OPTION_PROGRAM_ERROR__COLLATERAL_MISMATCH = 0x17d0; // 6096
 /** BuyRemainingAccountsUnsorted: buy_from_pool remaining_accounts are not sorted by (created_at asc, pubkey asc) */
-export const OPTION_PROGRAM_ERROR__BUY_REMAINING_ACCOUNTS_UNSORTED = 0x17ce; // 6094
+export const OPTION_PROGRAM_ERROR__BUY_REMAINING_ACCOUNTS_UNSORTED = 0x17d1; // 6097
 /** CloseLongWritersIncomplete: close_long_to_pool requires a complete set of active WriterPositions: sum(sold_qty) must equal pool.total_sold_qty */
-export const OPTION_PROGRAM_ERROR__CLOSE_LONG_WRITERS_INCOMPLETE = 0x17cf; // 6095
+export const OPTION_PROGRAM_ERROR__CLOSE_LONG_WRITERS_INCOMPLETE = 0x17d2; // 6098
 /** CloseLongNoSoldInventory: close_long_to_pool cannot run because no writer has sold inventory for this pool */
-export const OPTION_PROGRAM_ERROR__CLOSE_LONG_NO_SOLD_INVENTORY = 0x17d0; // 6096
+export const OPTION_PROGRAM_ERROR__CLOSE_LONG_NO_SOLD_INVENTORY = 0x17d3; // 6099
 /** CloseLongDuplicateWriter: close_long_to_pool remaining_accounts contain duplicate WriterPosition entries */
-export const OPTION_PROGRAM_ERROR__CLOSE_LONG_DUPLICATE_WRITER = 0x17d1; // 6097
+export const OPTION_PROGRAM_ERROR__CLOSE_LONG_DUPLICATE_WRITER = 0x17d4; // 6100
 /** MaintenanceBufferBreached: Writer position breaches maintenance buffer: free_collateral + claimable_theta < accrued_interest + fees + buffer */
-export const OPTION_PROGRAM_ERROR__MAINTENANCE_BUFFER_BREACHED = 0x17d2; // 6098
+export const OPTION_PROGRAM_ERROR__MAINTENANCE_BUFFER_BREACHED = 0x17d5; // 6101
 /** LiquidationInsufficientCollateralForDebt: Liquidation cannot cover full debt (principal + interest + fees) from writer's collateral + theta; call rescue path instead */
-export const OPTION_PROGRAM_ERROR__LIQUIDATION_INSUFFICIENT_COLLATERAL_FOR_DEBT = 0x17d3; // 6099
+export const OPTION_PROGRAM_ERROR__LIQUIDATION_INSUFFICIENT_COLLATERAL_FOR_DEBT = 0x17d6; // 6102
 /** ThetaClaimDisabled: claim_theta instruction has been removed; theta is now auto-realized on unwind or forfeited on liquidation */
-export const OPTION_PROGRAM_ERROR__THETA_CLAIM_DISABLED = 0x17d4; // 6100
+export const OPTION_PROGRAM_ERROR__THETA_CLAIM_DISABLED = 0x17d7; // 6103
 /** PoolLoanWriterMismatch: PoolLoan.writer_position does not match the WriterPosition in this instruction */
-export const OPTION_PROGRAM_ERROR__POOL_LOAN_WRITER_MISMATCH = 0x17d5; // 6101
+export const OPTION_PROGRAM_ERROR__POOL_LOAN_WRITER_MISMATCH = 0x17d8; // 6104
 /** MaintenanceLoansIncomplete: Maintenance debt sync remaining_accounts must contain every active PoolLoan for this writer */
-export const OPTION_PROGRAM_ERROR__MAINTENANCE_LOANS_INCOMPLETE = 0x17d6; // 6102
+export const OPTION_PROGRAM_ERROR__MAINTENANCE_LOANS_INCOMPLETE = 0x17d9; // 6105
 /** RescueUnauthorized: Rescue liquidation is gated to the vault keeper */
-export const OPTION_PROGRAM_ERROR__RESCUE_UNAUTHORIZED = 0x17d7; // 6103
+export const OPTION_PROGRAM_ERROR__RESCUE_UNAUTHORIZED = 0x17da; // 6106
 /** InvalidLoanRepayment: Loan repayment amount exceeds synced balances (principal/interest/fees) */
-export const OPTION_PROGRAM_ERROR__INVALID_LOAN_REPAYMENT = 0x17d8; // 6104
+export const OPTION_PROGRAM_ERROR__INVALID_LOAN_REPAYMENT = 0x17db; // 6107
 /** RescuePreconditionsNotMet: Rescue preconditions not met: collateral_vault must be short of the remaining debt after theta forfeiture */
-export const OPTION_PROGRAM_ERROR__RESCUE_PRECONDITIONS_NOT_MET = 0x17d9; // 6105
+export const OPTION_PROGRAM_ERROR__RESCUE_PRECONDITIONS_NOT_MET = 0x17dc; // 6108
 
 export type OptionProgramError =
   | typeof OPTION_PROGRAM_ERROR__ACCOUNT_FROZEN
@@ -233,6 +239,7 @@ export type OptionProgramError =
   | typeof OPTION_PROGRAM_ERROR__ARITHMETIC_OVERFLOW
   | typeof OPTION_PROGRAM_ERROR__ARITHMETIC_UNDERFLOW
   | typeof OPTION_PROGRAM_ERROR__BATCH_SIZE_EXCEEDED
+  | typeof OPTION_PROGRAM_ERROR__BUYER_PAYOUT_NOT_COMPLETE
   | typeof OPTION_PROGRAM_ERROR__BUY_REMAINING_ACCOUNTS_UNSORTED
   | typeof OPTION_PROGRAM_ERROR__CLOSE_LONG_DUPLICATE_WRITER
   | typeof OPTION_PROGRAM_ERROR__CLOSE_LONG_NO_SOLD_INVENTORY
@@ -289,10 +296,12 @@ export type OptionProgramError =
   | typeof OPTION_PROGRAM_ERROR__INVALID_UNDERLYING_PRICE
   | typeof OPTION_PROGRAM_ERROR__INVALID_VAULT_MINT
   | typeof OPTION_PROGRAM_ERROR__INVALID_VOLATILITY
+  | typeof OPTION_PROGRAM_ERROR__LENDER_REPAYMENT_NOT_COMPLETE
   | typeof OPTION_PROGRAM_ERROR__LIQUIDATION_INSUFFICIENT_COLLATERAL_FOR_DEBT
   | typeof OPTION_PROGRAM_ERROR__LOW_ORACLE_PRICE_CONFIDENCE
   | typeof OPTION_PROGRAM_ERROR__MAINTENANCE_BUFFER_BREACHED
   | typeof OPTION_PROGRAM_ERROR__MAINTENANCE_LOANS_INCOMPLETE
+  | typeof OPTION_PROGRAM_ERROR__MAKER_LIQUIDATED
   | typeof OPTION_PROGRAM_ERROR__MARKET_CLOSED
   | typeof OPTION_PROGRAM_ERROR__MAXIMUM_POSITION_SIZE_EXCEEDED
   | typeof OPTION_PROGRAM_ERROR__MAX_POSITIONS_REACHED
@@ -343,6 +352,7 @@ if (process.env.NODE_ENV !== "production") {
     [OPTION_PROGRAM_ERROR__ARITHMETIC_OVERFLOW]: `Arithmetic overflow occurred`,
     [OPTION_PROGRAM_ERROR__ARITHMETIC_UNDERFLOW]: `Arithmetic underflow occurred`,
     [OPTION_PROGRAM_ERROR__BATCH_SIZE_EXCEEDED]: `Batch size exceeds maximum allowed (10 positions)`,
+    [OPTION_PROGRAM_ERROR__BUYER_PAYOUT_NOT_COMPLETE]: `Buyer payout phase is not complete`,
     [OPTION_PROGRAM_ERROR__BUY_REMAINING_ACCOUNTS_UNSORTED]: `buy_from_pool remaining_accounts are not sorted by (created_at asc, pubkey asc)`,
     [OPTION_PROGRAM_ERROR__CLOSE_LONG_DUPLICATE_WRITER]: `close_long_to_pool remaining_accounts contain duplicate WriterPosition entries`,
     [OPTION_PROGRAM_ERROR__CLOSE_LONG_NO_SOLD_INVENTORY]: `close_long_to_pool cannot run because no writer has sold inventory for this pool`,
@@ -399,10 +409,12 @@ if (process.env.NODE_ENV !== "production") {
     [OPTION_PROGRAM_ERROR__INVALID_UNDERLYING_PRICE]: `Underlying price is invalid`,
     [OPTION_PROGRAM_ERROR__INVALID_VAULT_MINT]: `Invalid vault mint - does not match expected collateral mint`,
     [OPTION_PROGRAM_ERROR__INVALID_VOLATILITY]: `Volatility must be greater than zero`,
+    [OPTION_PROGRAM_ERROR__LENDER_REPAYMENT_NOT_COMPLETE]: `Lender repayment phase is not complete`,
     [OPTION_PROGRAM_ERROR__LIQUIDATION_INSUFFICIENT_COLLATERAL_FOR_DEBT]: `Liquidation cannot cover full debt (principal + interest + fees) from writer's collateral + theta; call rescue path instead`,
     [OPTION_PROGRAM_ERROR__LOW_ORACLE_PRICE_CONFIDENCE]: `Oracle price confidence is too low`,
     [OPTION_PROGRAM_ERROR__MAINTENANCE_BUFFER_BREACHED]: `Writer position breaches maintenance buffer: free_collateral + claimable_theta < accrued_interest + fees + buffer`,
     [OPTION_PROGRAM_ERROR__MAINTENANCE_LOANS_INCOMPLETE]: `Maintenance debt sync remaining_accounts must contain every active PoolLoan for this writer`,
+    [OPTION_PROGRAM_ERROR__MAKER_LIQUIDATED]: `Maker was liquidated and is excluded from expiry settlement`,
     [OPTION_PROGRAM_ERROR__MARKET_CLOSED]: `Market is closed`,
     [OPTION_PROGRAM_ERROR__MAXIMUM_POSITION_SIZE_EXCEEDED]: `Maximum position size exceeded`,
     [OPTION_PROGRAM_ERROR__MAX_POSITIONS_REACHED]: `Maximum positions limit reached`,

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(),