@epicentral/sos-sdk 0.10.2-beta → 0.10.4-beta

package/README.md

@@ -63,7 +63,7 @@ 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` | 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. |
+| `buildSettleMakerCollateralTransaction` | Expiry Phase A: keeper-signed lender repayment and maker-share snapshot. Repays one active loan's principal + accrued interest to OMLP from collateral vault, and initializes the maker settlement share from `WriterPosition` when older mints do not yet have one. 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. |
@@ -77,6 +77,7 @@ Additional modules:
   - Requires `writer` transaction signer.
   - On-chain transfers for lender repayment and collateral return are authorized by program PDAs (`collateral_pool` / `option_pool`) where applicable.
 - `buildSettleMakerCollateralTransaction`
+  - Requires a keeper transaction signer as payer for any missing `MakerCollateralShare` account.
   - No maker transaction signer is required by this instruction format.
   - 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.
@@ -86,7 +87,7 @@ Additional modules:
 
 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.
+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. The keeper pays rent to create the maker settlement share if the writer was opened through `option_mint` before that share existed. 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.
 

package/generated/instructions/settleMakerCollateral.ts

@@ -18,6 +18,7 @@ import {
   getStructEncoder,
   transformEncoder,
   type AccountMeta,
+  type AccountSignerMeta,
   type Address,
   type FixedSizeCodec,
   type FixedSizeDecoder,
@@ -27,7 +28,9 @@ import {
   type InstructionWithData,
   type ReadonlyAccount,
   type ReadonlyUint8Array,
+  type TransactionSigner,
   type WritableAccount,
+  type WritableSignerAccount,
 } from "@solana/kit";
 import { OPTION_PROGRAM_PROGRAM_ADDRESS } from "../programs";
 import {
@@ -50,12 +53,13 @@ export type SettleMakerCollateralInstruction<
   TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
   TAccountCollateralPool extends string | AccountMeta<string> = string,
   TAccountOptionAccount extends string | AccountMeta<string> = string,
-  TAccountMakerCollateralShare extends string | AccountMeta<string> = string,
   TAccountWriterPosition extends string | AccountMeta<string> = string,
+  TAccountMakerCollateralShare extends string | AccountMeta<string> = string,
   TAccountCollateralVault extends string | AccountMeta<string> = string,
   TAccountOmlpVault extends string | AccountMeta<string> = string,
   TAccountOmlpVaultState extends string | AccountMeta<string> = string,
   TAccountPoolLoan extends string | AccountMeta<string> = string,
+  TAccountKeeper extends string | AccountMeta<string> = string,
   TAccountTokenProgram extends string | AccountMeta<string> =
     "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
   TAccountSystemProgram extends string | AccountMeta<string> =
@@ -71,12 +75,12 @@ export type SettleMakerCollateralInstruction<
       TAccountOptionAccount extends string
         ? ReadonlyAccount<TAccountOptionAccount>
         : TAccountOptionAccount,
-      TAccountMakerCollateralShare extends string
-        ? WritableAccount<TAccountMakerCollateralShare>
-        : TAccountMakerCollateralShare,
       TAccountWriterPosition extends string
         ? WritableAccount<TAccountWriterPosition>
         : TAccountWriterPosition,
+      TAccountMakerCollateralShare extends string
+        ? WritableAccount<TAccountMakerCollateralShare>
+        : TAccountMakerCollateralShare,
       TAccountCollateralVault extends string
         ? WritableAccount<TAccountCollateralVault>
         : TAccountCollateralVault,
@@ -89,6 +93,10 @@ export type SettleMakerCollateralInstruction<
       TAccountPoolLoan extends string
         ? WritableAccount<TAccountPoolLoan>
         : TAccountPoolLoan,
+      TAccountKeeper extends string
+        ? WritableSignerAccount<TAccountKeeper> &
+            AccountSignerMeta<TAccountKeeper>
+        : TAccountKeeper,
       TAccountTokenProgram extends string
         ? ReadonlyAccount<TAccountTokenProgram>
         : TAccountTokenProgram,
@@ -134,20 +142,21 @@ export function getSettleMakerCollateralInstructionDataCodec(): FixedSizeCodec<
 export type SettleMakerCollateralAsyncInput<
   TAccountCollateralPool extends string = string,
   TAccountOptionAccount extends string = string,
-  TAccountMakerCollateralShare extends string = string,
   TAccountWriterPosition extends string = string,
+  TAccountMakerCollateralShare extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountOmlpVault extends string = string,
   TAccountOmlpVaultState extends string = string,
   TAccountPoolLoan extends string = string,
+  TAccountKeeper extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
 > = {
   collateralPool?: Address<TAccountCollateralPool>;
   /** The option account (needed for PDA derivation) */
   optionAccount: Address<TAccountOptionAccount>;
-  makerCollateralShare: Address<TAccountMakerCollateralShare>;
   writerPosition: Address<TAccountWriterPosition>;
+  makerCollateralShare: Address<TAccountMakerCollateralShare>;
   /** Pool's collateral vault */
   collateralVault: Address<TAccountCollateralVault>;
   /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
@@ -156,6 +165,7 @@ export type SettleMakerCollateralAsyncInput<
   omlpVaultState?: Address<TAccountOmlpVaultState>;
   /** Optional OMLP Pool Loan for leveraged makers; unleveraged makers omit it. */
   poolLoan?: Address<TAccountPoolLoan>;
+  keeper: TransactionSigner<TAccountKeeper>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
 };
@@ -163,12 +173,13 @@ export type SettleMakerCollateralAsyncInput<
 export async function getSettleMakerCollateralInstructionAsync<
   TAccountCollateralPool extends string,
   TAccountOptionAccount extends string,
-  TAccountMakerCollateralShare extends string,
   TAccountWriterPosition extends string,
+  TAccountMakerCollateralShare extends string,
   TAccountCollateralVault extends string,
   TAccountOmlpVault extends string,
   TAccountOmlpVaultState extends string,
   TAccountPoolLoan extends string,
+  TAccountKeeper extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
   TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
@@ -176,12 +187,13 @@ export async function getSettleMakerCollateralInstructionAsync<
   input: SettleMakerCollateralAsyncInput<
     TAccountCollateralPool,
     TAccountOptionAccount,
-    TAccountMakerCollateralShare,
     TAccountWriterPosition,
+    TAccountMakerCollateralShare,
     TAccountCollateralVault,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
+    TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
   >,
@@ -191,12 +203,13 @@ export async function getSettleMakerCollateralInstructionAsync<
     TProgramAddress,
     TAccountCollateralPool,
     TAccountOptionAccount,
-    TAccountMakerCollateralShare,
     TAccountWriterPosition,
+    TAccountMakerCollateralShare,
     TAccountCollateralVault,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
+    TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
   >
@@ -209,15 +222,16 @@ export async function getSettleMakerCollateralInstructionAsync<
   const originalAccounts = {
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
     optionAccount: { value: input.optionAccount ?? null, isWritable: false },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     makerCollateralShare: {
       value: input.makerCollateralShare ?? null,
       isWritable: true,
     },
-    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     omlpVault: { value: input.omlpVault ?? null, isWritable: true },
     omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
+    keeper: { value: input.keeper ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
   };
@@ -255,12 +269,13 @@ export async function getSettleMakerCollateralInstructionAsync<
     accounts: [
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.optionAccount),
-      getAccountMeta(accounts.makerCollateralShare),
       getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.makerCollateralShare),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.omlpVault),
       getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.poolLoan),
+      getAccountMeta(accounts.keeper),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
     ],
@@ -270,12 +285,13 @@ export async function getSettleMakerCollateralInstructionAsync<
     TProgramAddress,
     TAccountCollateralPool,
     TAccountOptionAccount,
-    TAccountMakerCollateralShare,
     TAccountWriterPosition,
+    TAccountMakerCollateralShare,
     TAccountCollateralVault,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
+    TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
   >);
@@ -284,20 +300,21 @@ export async function getSettleMakerCollateralInstructionAsync<
 export type SettleMakerCollateralInput<
   TAccountCollateralPool extends string = string,
   TAccountOptionAccount extends string = string,
-  TAccountMakerCollateralShare extends string = string,
   TAccountWriterPosition extends string = string,
+  TAccountMakerCollateralShare extends string = string,
   TAccountCollateralVault extends string = string,
   TAccountOmlpVault extends string = string,
   TAccountOmlpVaultState extends string = string,
   TAccountPoolLoan extends string = string,
+  TAccountKeeper extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
 > = {
   collateralPool: Address<TAccountCollateralPool>;
   /** The option account (needed for PDA derivation) */
   optionAccount: Address<TAccountOptionAccount>;
-  makerCollateralShare: Address<TAccountMakerCollateralShare>;
   writerPosition: Address<TAccountWriterPosition>;
+  makerCollateralShare: Address<TAccountMakerCollateralShare>;
   /** Pool's collateral vault */
   collateralVault: Address<TAccountCollateralVault>;
   /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
@@ -306,6 +323,7 @@ export type SettleMakerCollateralInput<
   omlpVaultState?: Address<TAccountOmlpVaultState>;
   /** Optional OMLP Pool Loan for leveraged makers; unleveraged makers omit it. */
   poolLoan?: Address<TAccountPoolLoan>;
+  keeper: TransactionSigner<TAccountKeeper>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
 };
@@ -313,12 +331,13 @@ export type SettleMakerCollateralInput<
 export function getSettleMakerCollateralInstruction<
   TAccountCollateralPool extends string,
   TAccountOptionAccount extends string,
-  TAccountMakerCollateralShare extends string,
   TAccountWriterPosition extends string,
+  TAccountMakerCollateralShare extends string,
   TAccountCollateralVault extends string,
   TAccountOmlpVault extends string,
   TAccountOmlpVaultState extends string,
   TAccountPoolLoan extends string,
+  TAccountKeeper extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
   TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
@@ -326,12 +345,13 @@ export function getSettleMakerCollateralInstruction<
   input: SettleMakerCollateralInput<
     TAccountCollateralPool,
     TAccountOptionAccount,
-    TAccountMakerCollateralShare,
     TAccountWriterPosition,
+    TAccountMakerCollateralShare,
     TAccountCollateralVault,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
+    TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
   >,
@@ -340,12 +360,13 @@ export function getSettleMakerCollateralInstruction<
   TProgramAddress,
   TAccountCollateralPool,
   TAccountOptionAccount,
-  TAccountMakerCollateralShare,
   TAccountWriterPosition,
+  TAccountMakerCollateralShare,
   TAccountCollateralVault,
   TAccountOmlpVault,
   TAccountOmlpVaultState,
   TAccountPoolLoan,
+  TAccountKeeper,
   TAccountTokenProgram,
   TAccountSystemProgram
 > {
@@ -357,15 +378,16 @@ export function getSettleMakerCollateralInstruction<
   const originalAccounts = {
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
     optionAccount: { value: input.optionAccount ?? null, isWritable: false },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     makerCollateralShare: {
       value: input.makerCollateralShare ?? null,
       isWritable: true,
     },
-    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
     omlpVault: { value: input.omlpVault ?? null, isWritable: true },
     omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
+    keeper: { value: input.keeper ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
   };
@@ -389,12 +411,13 @@ export function getSettleMakerCollateralInstruction<
     accounts: [
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.optionAccount),
-      getAccountMeta(accounts.makerCollateralShare),
       getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.makerCollateralShare),
       getAccountMeta(accounts.collateralVault),
       getAccountMeta(accounts.omlpVault),
       getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.poolLoan),
+      getAccountMeta(accounts.keeper),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
     ],
@@ -404,12 +427,13 @@ export function getSettleMakerCollateralInstruction<
     TProgramAddress,
     TAccountCollateralPool,
     TAccountOptionAccount,
-    TAccountMakerCollateralShare,
     TAccountWriterPosition,
+    TAccountMakerCollateralShare,
     TAccountCollateralVault,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
+    TAccountKeeper,
     TAccountTokenProgram,
     TAccountSystemProgram
   >);
@@ -424,8 +448,8 @@ export type ParsedSettleMakerCollateralInstruction<
     collateralPool: TAccountMetas[0];
     /** The option account (needed for PDA derivation) */
     optionAccount: TAccountMetas[1];
-    makerCollateralShare: TAccountMetas[2];
-    writerPosition: TAccountMetas[3];
+    writerPosition: TAccountMetas[2];
+    makerCollateralShare: TAccountMetas[3];
     /** Pool's collateral vault */
     collateralVault: TAccountMetas[4];
     /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
@@ -434,8 +458,9 @@ export type ParsedSettleMakerCollateralInstruction<
     omlpVaultState?: TAccountMetas[6] | undefined;
     /** Optional OMLP Pool Loan for leveraged makers; unleveraged makers omit it. */
     poolLoan?: TAccountMetas[7] | undefined;
-    tokenProgram: TAccountMetas[8];
-    systemProgram: TAccountMetas[9];
+    keeper: TAccountMetas[8];
+    tokenProgram: TAccountMetas[9];
+    systemProgram: TAccountMetas[10];
   };
   data: SettleMakerCollateralInstructionData;
 };
@@ -448,7 +473,7 @@ export function parseSettleMakerCollateralInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>,
 ): ParsedSettleMakerCollateralInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 10) {
+  if (instruction.accounts.length < 11) {
     // TODO: Coded error.
     throw new Error("Not enough accounts");
   }
@@ -469,12 +494,13 @@ export function parseSettleMakerCollateralInstruction<
     accounts: {
       collateralPool: getNextAccount(),
       optionAccount: getNextAccount(),
-      makerCollateralShare: getNextAccount(),
       writerPosition: getNextAccount(),
+      makerCollateralShare: getNextAccount(),
       collateralVault: getNextAccount(),
       omlpVault: getNextOptionalAccount(),
       omlpVaultState: getNextOptionalAccount(),
       poolLoan: getNextOptionalAccount(),
+      keeper: getNextAccount(),
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),
     },

package/generated/programs/optionProgram.ts

@@ -7,57 +7,13 @@
  */
 
 import {
-  assertIsInstructionWithAccounts,
   containsBytes,
   fixEncoderSize,
   getBytesEncoder,
   type Address,
-  type Instruction,
-  type InstructionWithData,
   type ReadonlyUint8Array,
 } from "@solana/kit";
 import {
-  parseAcceptAdminInstruction,
-  parseAutoExerciseAllExpiredInstruction,
-  parseAutoExerciseExpiredInstruction,
-  parseBorrowFromPoolInstruction,
-  parseBuyFromPoolInstruction,
-  parseClaimMakerRemainingInstruction,
-  parseCloseLongToPoolInstruction,
-  parseCloseOptionInstruction,
-  parseCreateEscrowV2Instruction,
-  parseDepositCollateralInstruction,
-  parseDepositToPositionInstruction,
-  parseInitCollateralPoolInstruction,
-  parseInitConfigInstruction,
-  parseInitializeMarketDataInstruction,
-  parseInitOptionPoolInstruction,
-  parseLiquidateWriterPositionInstruction,
-  parseLiquidateWriterPositionRescueInstruction,
-  parseMigrateCollateralPoolV1ToV2Instruction,
-  parseOmlpCreateVaultInstruction,
-  parseOmlpUpdateFeeWalletInstruction,
-  parseOmlpUpdateInterestModelInstruction,
-  parseOmlpUpdateLiquidationThresholdInstruction,
-  parseOmlpUpdateMaintenanceBufferInstruction,
-  parseOmlpUpdateMaxBorrowCapInstruction,
-  parseOmlpUpdateMaxLeverageInstruction,
-  parseOmlpUpdateProtocolFeeInstruction,
-  parseOmlpUpdateSupplyLimitInstruction,
-  parseOptionExerciseInstruction,
-  parseOptionMintInstruction,
-  parseOptionValidateInstruction,
-  parseRepayPoolLoanFromCollateralInstruction,
-  parseRepayPoolLoanFromWalletInstruction,
-  parseRepayPoolLoanInstruction,
-  parseSettleMakerCollateralInstruction,
-  parseSyncWriterPositionInstruction,
-  parseTransferAdminInstruction,
-  parseUnwindWriterUnsoldInstruction,
-  parseUpdateImpliedVolatilityInstruction,
-  parseUpdateMarketDataInstruction,
-  parseWithdrawFromPositionInstruction,
-  parseWriteToPoolInstruction,
   type ParsedAcceptAdminInstruction,
   type ParsedAutoExerciseAllExpiredInstruction,
   type ParsedAutoExerciseExpiredInstruction,
@@ -890,303 +846,3 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.WriteToPool;
     } & ParsedWriteToPoolInstruction<TProgram>);
-
-export function parseOptionProgramInstruction<TProgram extends string>(
-  instruction: Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array>,
-): ParsedOptionProgramInstruction<TProgram> {
-  const instructionType = identifyOptionProgramInstruction(instruction);
-  switch (instructionType) {
-    case OptionProgramInstruction.AcceptAdmin: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AcceptAdmin,
-        ...parseAcceptAdminInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.AutoExerciseAllExpired: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AutoExerciseAllExpired,
-        ...parseAutoExerciseAllExpiredInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.AutoExerciseExpired: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.AutoExerciseExpired,
-        ...parseAutoExerciseExpiredInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.BorrowFromPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.BorrowFromPool,
-        ...parseBorrowFromPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.BuyFromPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.BuyFromPool,
-        ...parseBuyFromPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.ClaimMakerRemaining: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.ClaimMakerRemaining,
-        ...parseClaimMakerRemainingInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CloseLongToPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CloseLongToPool,
-        ...parseCloseLongToPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CloseOption: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CloseOption,
-        ...parseCloseOptionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.CreateEscrowV2: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CreateEscrowV2,
-        ...parseCreateEscrowV2Instruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.DepositCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.DepositCollateral,
-        ...parseDepositCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.DepositToPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.DepositToPosition,
-        ...parseDepositToPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitCollateralPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitCollateralPool,
-        ...parseInitCollateralPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitConfig: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitConfig,
-        ...parseInitConfigInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitOptionPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitOptionPool,
-        ...parseInitOptionPoolInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.InitializeMarketData: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.InitializeMarketData,
-        ...parseInitializeMarketDataInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.LiquidateWriterPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.LiquidateWriterPosition,
-        ...parseLiquidateWriterPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.LiquidateWriterPositionRescue: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.LiquidateWriterPositionRescue,
-        ...parseLiquidateWriterPositionRescueInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.MigrateCollateralPoolV1ToV2: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.MigrateCollateralPoolV1ToV2,
-        ...parseMigrateCollateralPoolV1ToV2Instruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpCreateVault: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpCreateVault,
-        ...parseOmlpCreateVaultInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateFeeWallet: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateFeeWallet,
-        ...parseOmlpUpdateFeeWalletInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateInterestModel: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateInterestModel,
-        ...parseOmlpUpdateInterestModelInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateLiquidationThreshold: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType:
-          OptionProgramInstruction.OmlpUpdateLiquidationThreshold,
-        ...parseOmlpUpdateLiquidationThresholdInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateMaintenanceBuffer: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateMaintenanceBuffer,
-        ...parseOmlpUpdateMaintenanceBufferInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateMaxBorrowCap: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateMaxBorrowCap,
-        ...parseOmlpUpdateMaxBorrowCapInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateMaxLeverage: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateMaxLeverage,
-        ...parseOmlpUpdateMaxLeverageInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateProtocolFee: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateProtocolFee,
-        ...parseOmlpUpdateProtocolFeeInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OmlpUpdateSupplyLimit: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpUpdateSupplyLimit,
-        ...parseOmlpUpdateSupplyLimitInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionExercise: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionExercise,
-        ...parseOptionExerciseInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionMint: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionMint,
-        ...parseOptionMintInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.OptionValidate: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OptionValidate,
-        ...parseOptionValidateInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoan: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoan,
-        ...parseRepayPoolLoanInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoanFromCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoanFromCollateral,
-        ...parseRepayPoolLoanFromCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.RepayPoolLoanFromWallet: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.RepayPoolLoanFromWallet,
-        ...parseRepayPoolLoanFromWalletInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.SettleMakerCollateral: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.SettleMakerCollateral,
-        ...parseSettleMakerCollateralInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.SyncWriterPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.SyncWriterPosition,
-        ...parseSyncWriterPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.TransferAdmin: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.TransferAdmin,
-        ...parseTransferAdminInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UnwindWriterUnsold: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UnwindWriterUnsold,
-        ...parseUnwindWriterUnsoldInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UpdateImpliedVolatility: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UpdateImpliedVolatility,
-        ...parseUpdateImpliedVolatilityInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.UpdateMarketData: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.UpdateMarketData,
-        ...parseUpdateMarketDataInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.WithdrawFromPosition: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.WithdrawFromPosition,
-        ...parseWithdrawFromPositionInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.WriteToPool: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.WriteToPool,
-        ...parseWriteToPoolInstruction(instruction),
-      };
-    }
-    default:
-      throw new Error(
-        `Unrecognized instruction type: ${instructionType as string}`,
-      );
-  }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.10.2-beta",
+  "version": "0.10.4-beta",
   "private": false,
   "description": "Solana Option Standard SDK. The frontend-first SDK for Native Options Trading on Solana. Created by Epicentral Labs.",
   "type": "module",

package/short/builders.ts

@@ -128,6 +128,7 @@ export interface BuildSettleMakerCollateralParams {
   optionAccount: AddressLike;
   collateralVault: AddressLike;
   writerPosition: AddressLike;
+  keeper: TransactionSigner;
   /** OMLP Vault token account (destination for principal+interest). */
   omlpVault?: AddressLike;
   /** OMLP Vault state PDA (mut: updates `total_loans`, `total_liquidity`, `acc_interest_per_share_fp`). */
@@ -807,6 +808,7 @@ export async function buildSettleMakerCollateralInstruction(
     omlpVault: params.omlpVault ? toAddress(params.omlpVault) : undefined,
     omlpVaultState: params.omlpVaultState ? toAddress(params.omlpVaultState) : undefined,
     poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
+    keeper: params.keeper,
   });
   return kitInstruction;
 }