@epicentral/sos-sdk 0.9.1-beta → 0.10.1-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

@@ -1,4 +1,6 @@
 import {
+  COLLATERAL_POOL_DISCRIMINATOR,
+  OPTION_POOL_DISCRIMINATOR,
   getCollateralPoolDecoder,
   getLenderPositionDecoder,
   getMarketDataAccountDecoder,
@@ -19,10 +21,74 @@ import {
   type WriterPosition,
 } from "../generated/accounts";
 import type { Address } from "@solana/kit";
+import bs58 from "bs58";
 import { toAddress } from "../client/program";
 import type { AddressLike, KitRpc } from "../client/types";
 
-async function fetchRawAccount(
+/** Anchor `CollateralPool`: discriminator + option_account (32) + collateral_mint (32), then collateral_vault. */
+const COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET =
+  COLLATERAL_POOL_DISCRIMINATOR.length + 32 + 32;
+
+/** Sequential pubkeys before numeric fields (`option_pool` Anchor layout). */
+const OPTION_POOL_UNDERLYING_MINT_OFFSET =
+  OPTION_POOL_DISCRIMINATOR.length + 32 + 32 + 32;
+const OPTION_POOL_ESCROW_LONG_OFFSET = OPTION_POOL_UNDERLYING_MINT_OFFSET + 32;
+const OPTION_POOL_PREMIUM_VAULT_OFFSET = OPTION_POOL_ESCROW_LONG_OFFSET + 32;
+
+function discriminatorMatches(expected: Uint8Array, data: Uint8Array): boolean {
+  if (data.length < expected.length) return false;
+  for (let i = 0; i < expected.length; i++) {
+    if (data[i] !== expected[i]!) return false;
+  }
+  return true;
+}
+
+function collateralPoolDiscriminatorMatches(data: Uint8Array): boolean {
+  return discriminatorMatches(COLLATERAL_POOL_DISCRIMINATOR, data);
+}
+
+function optionPoolDiscriminatorMatches(data: Uint8Array): boolean {
+  return discriminatorMatches(OPTION_POOL_DISCRIMINATOR, data);
+}
+
+/**
+ * If full `OptionPool` decode fails, read the pubkey fields layout-traders need for resolving pool routes.
+ */
+export function decodeOptionPoolTradePubkeysFromRawData(data: Uint8Array): {
+  underlyingMint: Address;
+  escrowLongAccount: Address;
+  premiumVault: Address;
+} | undefined {
+  const end = OPTION_POOL_PREMIUM_VAULT_OFFSET + 32;
+  if (data.length < end) return undefined;
+  if (!optionPoolDiscriminatorMatches(data)) return undefined;
+  return {
+    underlyingMint: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_UNDERLYING_MINT_OFFSET, OPTION_POOL_UNDERLYING_MINT_OFFSET + 32)),
+    ),
+    escrowLongAccount: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_ESCROW_LONG_OFFSET, OPTION_POOL_ESCROW_LONG_OFFSET + 32)),
+    ),
+    premiumVault: toAddress(
+      bs58.encode(data.subarray(OPTION_POOL_PREMIUM_VAULT_OFFSET, OPTION_POOL_PREMIUM_VAULT_OFFSET + 32)),
+    ),
+  };
+}
+
+/**
+ * If full Codama decode fails (IDL / deployed account size mismatch), read `collateral_vault`
+ * from the fixed Anchor field order. This is sufficient for txs that only need vault + pool PDAs.
+ */
+export function decodeCollateralVaultFromCollateralPoolRawData(
+  data: Uint8Array
+): Address | undefined {
+  const end = COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET + 32;
+  if (data.length < end) return undefined;
+  if (!collateralPoolDiscriminatorMatches(data)) return undefined;
+  return toAddress(bs58.encode(data.subarray(COLLATERAL_POOL_COLLATERAL_VAULT_OFFSET, end)));
+}
+
+export async function fetchAccountData(
   rpc: KitRpc,
   address: AddressLike
 ): Promise<Uint8Array | null> {
@@ -32,7 +98,7 @@ async function fetchRawAccount(
   const [data] = accountInfo.data;
   const binary = atob(data);
   const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
+  for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i)!;
   return bytes;
 }
 
@@ -41,9 +107,13 @@ async function decodeAccount<T>(
   address: AddressLike,
   decoder: { decode: (value: Uint8Array) => T }
 ): Promise<T | null> {
-  const data = await fetchRawAccount(rpc, address);
+  const data = await fetchAccountData(rpc, address);
   if (!data) return null;
-  return decoder.decode(data);
+  try {
+    return decoder.decode(data);
+  } catch {
+    return null;
+  }
 }
 
 export async function fetchOptionAccount(
@@ -148,21 +218,21 @@ export async function fetchOptionAccounts(
   for (let i = 0; i < keys.length; i++) {
     const accountInfo = infos[i];
     if (!accountInfo) {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
       continue;
     }
     const [b64] = accountInfo.data;
     if (!b64) {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
       continue;
     }
     const binary = atob(b64);
     const data = new Uint8Array(binary.length);
-    for (let j = 0; j < binary.length; j++) data[j] = binary.charCodeAt(j);
+    for (let j = 0; j < binary.length; j++) data[j] = binary.charCodeAt(j)!;
     try {
-      result.set(keys[i], optionDecoder.decode(data));
+      result.set(keys[i]!, optionDecoder.decode(data));
     } catch {
-      result.set(keys[i], null);
+      result.set(keys[i]!, null);
     }
   }
   return result;

package/accounts/list.ts

@@ -97,14 +97,20 @@ async function fetchAndDecodeProgramAccounts<T>(
     ? (response as Array<ProgramAccountResponse>)
     : (response as { value: Array<ProgramAccountResponse> }).value;
 
-  return rawAccounts.map(({ pubkey, account }) => {
+  const out: Array<ListedAccount<T>> = [];
+  for (const { pubkey, account } of rawAccounts) {
     const base64Data =
       Array.isArray(account.data) ? account.data[0] : account.data;
-    return {
-      address: pubkey,
-      data: decoder.decode(decodeBase64Data(base64Data)),
-    };
-  });
+    try {
+      out.push({
+        address: pubkey,
+        data: decoder.decode(decodeBase64Data(base64Data)),
+      });
+    } catch {
+      /** Skip malformed / IDL-size mismatches instead of throwing from getProgramAccounts. */
+    }
+  }
+  return out;
 }
 
 export async function fetchWriterPositionsByWriter(

package/accounts/resolve-option.ts

@@ -1,7 +1,12 @@
 import type { Address } from "@solana/kit";
 import { OptionType } from "../generated/types";
-import { toAddress } from "../client/program";
 import type { AddressLike, KitRpc } from "../client/types";
+import type { CollateralPool, OptionAccount, OptionPool } from "../generated/accounts";
+import {
+  getCollateralPoolDecoder,
+  getOptionAccountDecoder,
+  getOptionPoolDecoder,
+} from "../generated/accounts";
 import {
   deriveCollateralPoolPda,
   deriveLongMintPda,
@@ -11,7 +16,11 @@ import {
   deriveOptionPoolPda,
   deriveShortMintPda,
 } from "./pdas";
-import { fetchCollateralPool, fetchOptionAccount, fetchOptionPool } from "./fetchers";
+import {
+  decodeCollateralVaultFromCollateralPoolRawData,
+  decodeOptionPoolTradePubkeysFromRawData,
+  fetchAccountData,
+} from "./fetchers";
 
 export interface ResolveOptionAccountsParams {
   underlyingAsset: AddressLike;
@@ -34,9 +43,9 @@ export interface ResolvedOptionAccounts {
   escrowLongAccount?: Address;
   premiumVault?: Address;
   collateralVault?: Address;
-  optionPoolData?: Awaited<ReturnType<typeof fetchOptionPool>>;
-  optionAccountData?: Awaited<ReturnType<typeof fetchOptionAccount>>;
-  collateralPoolData?: Awaited<ReturnType<typeof fetchCollateralPool>>;
+  optionPoolData?: OptionPool;
+  optionAccountData?: OptionAccount;
+  collateralPoolData?: CollateralPool;
 }
 
 /**
@@ -76,27 +85,59 @@ export async function resolveOptionAccounts(
   };
 
   if (params.rpc) {
-    const [optionPoolFetched, optionAccountFetched, collateralPoolFetched] =
+    const optionPoolDecoder = getOptionPoolDecoder();
+    const optionAccountDecoder = getOptionAccountDecoder();
+    const collateralPoolDecoder = getCollateralPoolDecoder();
+    const [optionPoolBytes, optionAccountBytes, collateralPoolBytes] =
       await Promise.all([
-        fetchOptionPool(params.rpc, optionPool),
-        fetchOptionAccount(params.rpc, optionAccount),
-        fetchCollateralPool(params.rpc, collateralPool),
+        fetchAccountData(params.rpc, optionPool),
+        fetchAccountData(params.rpc, optionAccount),
+        fetchAccountData(params.rpc, collateralPool),
       ]);
 
-    if (optionPoolFetched) {
-      result.optionPoolData = optionPoolFetched;
-      result.escrowLongAccount = optionPoolFetched.escrowLongAccount;
-      result.premiumVault = optionPoolFetched.premiumVault;
-      result.underlyingMint = optionPoolFetched.underlyingMint;
+    if (optionPoolBytes) {
+      let optionPoolDecoded: OptionPool | null = null;
+      try {
+        optionPoolDecoded = optionPoolDecoder.decode(optionPoolBytes);
+      } catch {
+        optionPoolDecoded = null;
+      }
+      if (optionPoolDecoded) {
+        result.optionPoolData = optionPoolDecoded;
+        result.escrowLongAccount = optionPoolDecoded.escrowLongAccount;
+        result.premiumVault = optionPoolDecoded.premiumVault;
+        result.underlyingMint = optionPoolDecoded.underlyingMint;
+      } else {
+        const tradePubkeys =
+          decodeOptionPoolTradePubkeysFromRawData(optionPoolBytes);
+        if (tradePubkeys) {
+          result.escrowLongAccount = tradePubkeys.escrowLongAccount;
+          result.premiumVault = tradePubkeys.premiumVault;
+          result.underlyingMint = tradePubkeys.underlyingMint;
+        }
+      }
     }
 
-    if (optionAccountFetched) {
-      result.optionAccountData = optionAccountFetched;
+    if (optionAccountBytes) {
+      try {
+        result.optionAccountData = optionAccountDecoder.decode(optionAccountBytes);
+      } catch {
+        /* layout drift: PDAs remain valid; Greeks-only consumers see no OptionAccount snapshot */
+      }
     }
 
-    if (collateralPoolFetched) {
-      result.collateralPoolData = collateralPoolFetched;
-      result.collateralVault = collateralPoolFetched.collateralVault;
+    if (collateralPoolBytes) {
+      try {
+        const collateralPoolFetched = collateralPoolDecoder.decode(collateralPoolBytes);
+        result.collateralPoolData = collateralPoolFetched;
+        result.collateralVault = collateralPoolFetched.collateralVault;
+      } catch {
+        const vaultFallback =
+          decodeCollateralVaultFromCollateralPoolRawData(collateralPoolBytes);
+        if (vaultFallback) {
+          result.collateralVault = vaultFallback;
+        }
+      }
     }
   }
 

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`,