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

package/generated/instructions/settleMakerCollateral.ts

@@ -51,8 +51,8 @@ export type SettleMakerCollateralInstruction<
   TAccountCollateralPool extends string | AccountMeta<string> = string,
   TAccountOptionAccount extends string | AccountMeta<string> = string,
   TAccountMakerCollateralShare extends string | AccountMeta<string> = string,
+  TAccountWriterPosition extends string | AccountMeta<string> = string,
   TAccountCollateralVault extends string | AccountMeta<string> = string,
-  TAccountMakerCollateralAccount extends string | AccountMeta<string> = string,
   TAccountOmlpVault extends string | AccountMeta<string> = string,
   TAccountOmlpVaultState extends string | AccountMeta<string> = string,
   TAccountPoolLoan extends string | AccountMeta<string> = string,
@@ -74,12 +74,12 @@ export type SettleMakerCollateralInstruction<
       TAccountMakerCollateralShare extends string
         ? WritableAccount<TAccountMakerCollateralShare>
         : TAccountMakerCollateralShare,
+      TAccountWriterPosition extends string
+        ? WritableAccount<TAccountWriterPosition>
+        : TAccountWriterPosition,
       TAccountCollateralVault extends string
         ? WritableAccount<TAccountCollateralVault>
         : TAccountCollateralVault,
-      TAccountMakerCollateralAccount extends string
-        ? WritableAccount<TAccountMakerCollateralAccount>
-        : TAccountMakerCollateralAccount,
       TAccountOmlpVault extends string
         ? WritableAccount<TAccountOmlpVault>
         : TAccountOmlpVault,
@@ -135,8 +135,8 @@ export type SettleMakerCollateralAsyncInput<
   TAccountCollateralPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountMakerCollateralShare extends string = string,
+  TAccountWriterPosition extends string = string,
   TAccountCollateralVault extends string = string,
-  TAccountMakerCollateralAccount extends string = string,
   TAccountOmlpVault extends string = string,
   TAccountOmlpVaultState extends string = string,
   TAccountPoolLoan extends string = string,
@@ -147,23 +147,15 @@ export type SettleMakerCollateralAsyncInput<
   /** The option account (needed for PDA derivation) */
   optionAccount: Address<TAccountOptionAccount>;
   makerCollateralShare: Address<TAccountMakerCollateralShare>;
+  writerPosition: Address<TAccountWriterPosition>;
   /** Pool's collateral vault */
   collateralVault: Address<TAccountCollateralVault>;
-  /** Maker's WSOL account (receives remaining collateral) */
-  makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
-  /** OMLP Vault token account (receives loan repayments) */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: updates `total_loans`, `total_liquidity`,
-   * and `acc_interest_per_share_fp` via `add_interest_to_index` so lenders
-   * actually realize the interest this settlement just paid them).
-   */
-  omlpVaultState: Address<TAccountOmlpVaultState>;
-  /**
-   * The OMLP Pool Loan to mark as repaid (V2 pooled system)
-   * Must belong to the same maker as the collateral share
-   */
-  poolLoan: Address<TAccountPoolLoan>;
+  /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
+  omlpVault?: Address<TAccountOmlpVault>;
+  /** OMLP Vault state PDA when the maker borrowed. */
+  omlpVaultState?: Address<TAccountOmlpVaultState>;
+  /** Optional OMLP Pool Loan for leveraged makers; unleveraged makers omit it. */
+  poolLoan?: Address<TAccountPoolLoan>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
 };
@@ -172,8 +164,8 @@ export async function getSettleMakerCollateralInstructionAsync<
   TAccountCollateralPool extends string,
   TAccountOptionAccount extends string,
   TAccountMakerCollateralShare extends string,
+  TAccountWriterPosition extends string,
   TAccountCollateralVault extends string,
-  TAccountMakerCollateralAccount extends string,
   TAccountOmlpVault extends string,
   TAccountOmlpVaultState extends string,
   TAccountPoolLoan extends string,
@@ -185,8 +177,8 @@ export async function getSettleMakerCollateralInstructionAsync<
     TAccountCollateralPool,
     TAccountOptionAccount,
     TAccountMakerCollateralShare,
+    TAccountWriterPosition,
     TAccountCollateralVault,
-    TAccountMakerCollateralAccount,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
@@ -200,8 +192,8 @@ export async function getSettleMakerCollateralInstructionAsync<
     TAccountCollateralPool,
     TAccountOptionAccount,
     TAccountMakerCollateralShare,
+    TAccountWriterPosition,
     TAccountCollateralVault,
-    TAccountMakerCollateralAccount,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
@@ -221,11 +213,8 @@ export async function getSettleMakerCollateralInstructionAsync<
       value: input.makerCollateralShare ?? null,
       isWritable: true,
     },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
-    makerCollateralAccount: {
-      value: input.makerCollateralAccount ?? null,
-      isWritable: true,
-    },
     omlpVault: { value: input.omlpVault ?? null, isWritable: true },
     omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
@@ -267,8 +256,8 @@ export async function getSettleMakerCollateralInstructionAsync<
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.makerCollateralShare),
+      getAccountMeta(accounts.writerPosition),
       getAccountMeta(accounts.collateralVault),
-      getAccountMeta(accounts.makerCollateralAccount),
       getAccountMeta(accounts.omlpVault),
       getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.poolLoan),
@@ -282,8 +271,8 @@ export async function getSettleMakerCollateralInstructionAsync<
     TAccountCollateralPool,
     TAccountOptionAccount,
     TAccountMakerCollateralShare,
+    TAccountWriterPosition,
     TAccountCollateralVault,
-    TAccountMakerCollateralAccount,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
@@ -296,8 +285,8 @@ export type SettleMakerCollateralInput<
   TAccountCollateralPool extends string = string,
   TAccountOptionAccount extends string = string,
   TAccountMakerCollateralShare extends string = string,
+  TAccountWriterPosition extends string = string,
   TAccountCollateralVault extends string = string,
-  TAccountMakerCollateralAccount extends string = string,
   TAccountOmlpVault extends string = string,
   TAccountOmlpVaultState extends string = string,
   TAccountPoolLoan extends string = string,
@@ -308,23 +297,15 @@ export type SettleMakerCollateralInput<
   /** The option account (needed for PDA derivation) */
   optionAccount: Address<TAccountOptionAccount>;
   makerCollateralShare: Address<TAccountMakerCollateralShare>;
+  writerPosition: Address<TAccountWriterPosition>;
   /** Pool's collateral vault */
   collateralVault: Address<TAccountCollateralVault>;
-  /** Maker's WSOL account (receives remaining collateral) */
-  makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
-  /** OMLP Vault token account (receives loan repayments) */
-  omlpVault: Address<TAccountOmlpVault>;
-  /**
-   * OMLP Vault state PDA (mut: updates `total_loans`, `total_liquidity`,
-   * and `acc_interest_per_share_fp` via `add_interest_to_index` so lenders
-   * actually realize the interest this settlement just paid them).
-   */
-  omlpVaultState: Address<TAccountOmlpVaultState>;
-  /**
-   * The OMLP Pool Loan to mark as repaid (V2 pooled system)
-   * Must belong to the same maker as the collateral share
-   */
-  poolLoan: Address<TAccountPoolLoan>;
+  /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
+  omlpVault?: Address<TAccountOmlpVault>;
+  /** OMLP Vault state PDA when the maker borrowed. */
+  omlpVaultState?: Address<TAccountOmlpVaultState>;
+  /** Optional OMLP Pool Loan for leveraged makers; unleveraged makers omit it. */
+  poolLoan?: Address<TAccountPoolLoan>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
 };
@@ -333,8 +314,8 @@ export function getSettleMakerCollateralInstruction<
   TAccountCollateralPool extends string,
   TAccountOptionAccount extends string,
   TAccountMakerCollateralShare extends string,
+  TAccountWriterPosition extends string,
   TAccountCollateralVault extends string,
-  TAccountMakerCollateralAccount extends string,
   TAccountOmlpVault extends string,
   TAccountOmlpVaultState extends string,
   TAccountPoolLoan extends string,
@@ -346,8 +327,8 @@ export function getSettleMakerCollateralInstruction<
     TAccountCollateralPool,
     TAccountOptionAccount,
     TAccountMakerCollateralShare,
+    TAccountWriterPosition,
     TAccountCollateralVault,
-    TAccountMakerCollateralAccount,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
@@ -360,8 +341,8 @@ export function getSettleMakerCollateralInstruction<
   TAccountCollateralPool,
   TAccountOptionAccount,
   TAccountMakerCollateralShare,
+  TAccountWriterPosition,
   TAccountCollateralVault,
-  TAccountMakerCollateralAccount,
   TAccountOmlpVault,
   TAccountOmlpVaultState,
   TAccountPoolLoan,
@@ -380,11 +361,8 @@ export function getSettleMakerCollateralInstruction<
       value: input.makerCollateralShare ?? null,
       isWritable: true,
     },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
     collateralVault: { value: input.collateralVault ?? null, isWritable: true },
-    makerCollateralAccount: {
-      value: input.makerCollateralAccount ?? null,
-      isWritable: true,
-    },
     omlpVault: { value: input.omlpVault ?? null, isWritable: true },
     omlpVaultState: { value: input.omlpVaultState ?? null, isWritable: true },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
@@ -412,8 +390,8 @@ export function getSettleMakerCollateralInstruction<
       getAccountMeta(accounts.collateralPool),
       getAccountMeta(accounts.optionAccount),
       getAccountMeta(accounts.makerCollateralShare),
+      getAccountMeta(accounts.writerPosition),
       getAccountMeta(accounts.collateralVault),
-      getAccountMeta(accounts.makerCollateralAccount),
       getAccountMeta(accounts.omlpVault),
       getAccountMeta(accounts.omlpVaultState),
       getAccountMeta(accounts.poolLoan),
@@ -427,8 +405,8 @@ export function getSettleMakerCollateralInstruction<
     TAccountCollateralPool,
     TAccountOptionAccount,
     TAccountMakerCollateralShare,
+    TAccountWriterPosition,
     TAccountCollateralVault,
-    TAccountMakerCollateralAccount,
     TAccountOmlpVault,
     TAccountOmlpVaultState,
     TAccountPoolLoan,
@@ -447,23 +425,15 @@ export type ParsedSettleMakerCollateralInstruction<
     /** The option account (needed for PDA derivation) */
     optionAccount: TAccountMetas[1];
     makerCollateralShare: TAccountMetas[2];
+    writerPosition: TAccountMetas[3];
     /** Pool's collateral vault */
-    collateralVault: TAccountMetas[3];
-    /** Maker's WSOL account (receives remaining collateral) */
-    makerCollateralAccount: TAccountMetas[4];
-    /** OMLP Vault token account (receives loan repayments) */
-    omlpVault: TAccountMetas[5];
-    /**
-     * OMLP Vault state PDA (mut: updates `total_loans`, `total_liquidity`,
-     * and `acc_interest_per_share_fp` via `add_interest_to_index` so lenders
-     * actually realize the interest this settlement just paid them).
-     */
-    omlpVaultState: TAccountMetas[6];
-    /**
-     * The OMLP Pool Loan to mark as repaid (V2 pooled system)
-     * Must belong to the same maker as the collateral share
-     */
-    poolLoan: TAccountMetas[7];
+    collateralVault: TAccountMetas[4];
+    /** OMLP Vault token account (receives loan repayments when the maker borrowed) */
+    omlpVault?: TAccountMetas[5] | undefined;
+    /** OMLP Vault state PDA when the maker borrowed. */
+    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];
   };
@@ -488,17 +458,23 @@ export function parseSettleMakerCollateralInstruction<
     accountIndex += 1;
     return accountMeta;
   };
+  const getNextOptionalAccount = () => {
+    const accountMeta = getNextAccount();
+    return accountMeta.address === OPTION_PROGRAM_PROGRAM_ADDRESS
+      ? undefined
+      : accountMeta;
+  };
   return {
     programAddress: instruction.programAddress,
     accounts: {
       collateralPool: getNextAccount(),
       optionAccount: getNextAccount(),
       makerCollateralShare: getNextAccount(),
+      writerPosition: getNextAccount(),
       collateralVault: getNextAccount(),
-      makerCollateralAccount: getNextAccount(),
-      omlpVault: getNextAccount(),
-      omlpVaultState: getNextAccount(),
-      poolLoan: getNextAccount(),
+      omlpVault: getNextOptionalAccount(),
+      omlpVaultState: getNextOptionalAccount(),
+      poolLoan: getNextOptionalAccount(),
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),
     },

package/generated/programs/optionProgram.ts

@@ -22,6 +22,7 @@ import {
   parseAutoExerciseExpiredInstruction,
   parseBorrowFromPoolInstruction,
   parseBuyFromPoolInstruction,
+  parseClaimMakerRemainingInstruction,
   parseCloseLongToPoolInstruction,
   parseCloseOptionInstruction,
   parseCreateEscrowV2Instruction,
@@ -61,6 +62,7 @@ import {
   type ParsedAutoExerciseExpiredInstruction,
   type ParsedBorrowFromPoolInstruction,
   type ParsedBuyFromPoolInstruction,
+  type ParsedClaimMakerRemainingInstruction,
   type ParsedCloseLongToPoolInstruction,
   type ParsedCloseOptionInstruction,
   type ParsedCreateEscrowV2Instruction,
@@ -262,6 +264,7 @@ export enum OptionProgramInstruction {
   AutoExerciseExpired,
   BorrowFromPool,
   BuyFromPool,
+  ClaimMakerRemaining,
   CloseLongToPool,
   CloseOption,
   CreateEscrowV2,
@@ -357,6 +360,17 @@ export function identifyOptionProgramInstruction(
   ) {
     return OptionProgramInstruction.BuyFromPool;
   }
+  if (
+    containsBytes(
+      data,
+      fixEncoderSize(getBytesEncoder(), 8).encode(
+        new Uint8Array([108, 194, 135, 237, 155, 192, 199, 57]),
+      ),
+      0,
+    )
+  ) {
+    return OptionProgramInstruction.ClaimMakerRemaining;
+  }
   if (
     containsBytes(
       data,
@@ -754,6 +768,9 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.BuyFromPool;
     } & ParsedBuyFromPoolInstruction<TProgram>)
+  | ({
+      instructionType: OptionProgramInstruction.ClaimMakerRemaining;
+    } & ParsedClaimMakerRemainingInstruction<TProgram>)
   | ({
       instructionType: OptionProgramInstruction.CloseLongToPool;
     } & ParsedCloseLongToPoolInstruction<TProgram>)
@@ -897,6 +914,13 @@ export function parseOptionProgramInstruction<TProgram extends string>(
         ...parseBuyFromPoolInstruction(instruction),
       };
     }
+    case OptionProgramInstruction.ClaimMakerRemaining: {
+      assertIsInstructionWithAccounts(instruction);
+      return {
+        instructionType: OptionProgramInstruction.ClaimMakerRemaining,
+        ...parseClaimMakerRemainingInstruction(instruction),
+      };
+    }
     case OptionProgramInstruction.CloseLongToPool: {
       assertIsInstructionWithAccounts(instruction);
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.9.1-beta",
+  "version": "0.10.0-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

@@ -127,12 +127,12 @@ export interface BuildSyncWriterPositionParams {
 export interface BuildSettleMakerCollateralParams {
   optionAccount: AddressLike;
   collateralVault: AddressLike;
-  makerCollateralAccount: AddressLike;
+  writerPosition: AddressLike;
   /** OMLP Vault token account (destination for principal+interest). */
-  omlpVault: AddressLike;
+  omlpVault?: AddressLike;
   /** OMLP Vault state PDA (mut: updates `total_loans`, `total_liquidity`, `acc_interest_per_share_fp`). */
-  omlpVaultState: AddressLike;
-  poolLoan: AddressLike;
+  omlpVaultState?: AddressLike;
+  poolLoan?: AddressLike;
   maker: AddressLike;
   makerCollateralShare?: AddressLike;
   collateralPool?: AddressLike;
@@ -802,11 +802,11 @@ export async function buildSettleMakerCollateralInstruction(
     optionAccount: toAddress(params.optionAccount),
     collateralPool: params.collateralPool ? toAddress(params.collateralPool) : undefined,
     makerCollateralShare: toAddress(makerCollateralShare),
+    writerPosition: toAddress(params.writerPosition),
     collateralVault: toAddress(params.collateralVault),
-    makerCollateralAccount: toAddress(params.makerCollateralAccount),
-    omlpVault: toAddress(params.omlpVault),
-    omlpVaultState: toAddress(params.omlpVaultState),
-    poolLoan: toAddress(params.poolLoan),
+    omlpVault: params.omlpVault ? toAddress(params.omlpVault) : undefined,
+    omlpVaultState: params.omlpVaultState ? toAddress(params.omlpVaultState) : undefined,
+    poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
   });
   return kitInstruction;
 }