@epicentral/sos-sdk 0.5.0-alpha.8 → 0.6.1-alpha

package/long/builders.ts

@@ -17,10 +17,15 @@ import {
   type RemainingAccountInput,
 } from "../shared/remaining-accounts";
 import type { OptionType } from "../generated/types";
-import { getCreateAssociatedTokenIdempotentInstructionWithAddress, NATIVE_MINT } from "../wsol/instructions";
-import { fetchOptionPool } from "../accounts/fetchers";
+import {
+  getCloseAccountInstruction,
+  getCreateAssociatedTokenIdempotentInstructionWithAddress,
+  NATIVE_MINT,
+} from "../wsol/instructions";
+import { fetchMarketDataAccount, fetchOptionPool } from "../accounts/fetchers";
 import { getBuyFromPoolRemainingAccounts } from "./remaining-accounts";
 import { fetchWriterPositionsForPool } from "../accounts/list";
+import bs58 from "bs58";
 
 export interface BuildBuyFromPoolParams {
   optionPool: AddressLike;
@@ -28,7 +33,7 @@ export interface BuildBuyFromPoolParams {
   longMint: AddressLike;
   underlyingMint: AddressLike;
   marketData: AddressLike;
-  priceUpdate: AddressLike;
+  switchboardFeed: AddressLike;
   buyer: AddressLike;
   buyerPaymentAccount: AddressLike;
   escrowLongAccount: AddressLike;
@@ -49,7 +54,7 @@ export interface BuildCloseLongToPoolParams {
   escrowLongAccount: AddressLike;
   premiumVault: AddressLike;
   marketData: AddressLike;
-  priceUpdate: AddressLike;
+  switchboardFeed: AddressLike;
   buyer: AddressLike;
   buyerLongAccount: AddressLike;
   buyerPayoutAccount: AddressLike;
@@ -58,6 +63,16 @@ export interface BuildCloseLongToPoolParams {
   minPayoutAmount: bigint | number;
   buyerPosition?: AddressLike;
   omlpVault?: AddressLike;
+  /**
+   * When true, appends an SPL CloseAccount to close the buyer's LONG token account after close_long_to_pool (reclaim rent).
+   * Set to true only when closing the entire position; for partial closes the LONG ATA still holds remaining tokens.
+   */
+  closeLongTokenAccount?: boolean;
+  /**
+   * When true and underlying is WSOL, appends an SPL CloseAccount to unwrap the payout ATA so the buyer receives native SOL.
+   * Ignored when underlyingMint is not WSOL.
+   */
+  unwrapPayoutSol?: boolean;
   remainingAccounts?: RemainingAccountInput[];
 }
 
@@ -73,7 +88,7 @@ export async function buildBuyFromPoolInstruction(
     longMint: toAddress(params.longMint),
     underlyingMint: toAddress(params.underlyingMint),
     marketData: toAddress(params.marketData),
-    priceUpdate: toAddress(params.priceUpdate),
+    switchboardFeed: toAddress(params.switchboardFeed),
     buyer: toAddress(params.buyer) as any,
     buyerPosition: params.buyerPosition ? toAddress(params.buyerPosition) : undefined,
     buyerOptionAccount: params.buyerOptionAccount
@@ -120,7 +135,7 @@ export interface BuildBuyFromPoolTransactionWithDerivationParams {
   expirationDate: bigint | number;
   buyer: AddressLike;
   buyerPaymentAccount: AddressLike;
-  priceUpdate: AddressLike;
+  switchboardFeed?: AddressLike;
   quantity: bigint | number;
   premiumAmount: bigint | number;
   rpc: KitRpc;
@@ -198,13 +213,24 @@ export async function buildBuyFromPoolTransactionWithDerivation(
       : deriveAssociatedTokenAddress(params.buyer, resolved.longMint),
   ]);
 
+  const marketDataAccount = await fetchMarketDataAccount(params.rpc, resolved.marketData);
+  invariant(
+    !!marketDataAccount,
+    "Market data account not found for resolved option market."
+  );
+  const switchboardFeed =
+    params.switchboardFeed ??
+    bs58.encode(
+      Array.from(marketDataAccount.switchboardFeedId as unknown as Uint8Array)
+    );
+
   return buildBuyFromPoolTransaction({
     optionPool: resolved.optionPool,
     optionAccount: resolved.optionAccount,
     longMint: resolved.longMint,
     underlyingMint: resolved.underlyingMint!,
     marketData: resolved.marketData,
-    priceUpdate: params.priceUpdate,
+    switchboardFeed,
     buyer: params.buyer,
     buyerPaymentAccount: params.buyerPaymentAccount,
     escrowLongAccount: resolved.escrowLongAccount!,
@@ -292,13 +318,24 @@ export async function buildBuyFromPoolMarketOrderTransactionWithDerivation(
   const maxPremiumAmount = BigInt(params.quotedPremiumTotal) + slippageBuffer;
   assertPositiveAmount(maxPremiumAmount, "maxPremiumAmount");
 
+  const marketDataAccount = await fetchMarketDataAccount(params.rpc, resolved.marketData);
+  invariant(
+    !!marketDataAccount,
+    "Market data account not found for resolved option market."
+  );
+  const switchboardFeed =
+    params.switchboardFeed ??
+    bs58.encode(
+      Array.from(marketDataAccount.switchboardFeedId as unknown as Uint8Array)
+    );
+
   return buildBuyFromPoolTransaction({
     optionPool: resolved.optionPool,
     optionAccount: resolved.optionAccount,
     longMint: resolved.longMint,
     underlyingMint: refetchedPool.underlyingMint,
     marketData: resolved.marketData,
-    priceUpdate: params.priceUpdate,
+    switchboardFeed,
     buyer: params.buyer,
     buyerPaymentAccount: params.buyerPaymentAccount,
     escrowLongAccount: refetchedPool.escrowLongAccount,
@@ -329,7 +366,7 @@ export async function buildCloseLongToPoolInstruction(
     escrowLongAccount: toAddress(params.escrowLongAccount),
     premiumVault: toAddress(params.premiumVault),
     marketData: toAddress(params.marketData),
-    priceUpdate: toAddress(params.priceUpdate),
+    switchboardFeed: toAddress(params.switchboardFeed),
     buyer: toAddress(params.buyer) as any,
     buyerLongAccount: toAddress(params.buyerLongAccount),
     buyerPayoutAccount: toAddress(params.buyerPayoutAccount),
@@ -347,7 +384,32 @@ export async function buildCloseLongToPoolTransaction(
   params: BuildCloseLongToPoolParams
 ): Promise<BuiltTransaction> {
   const instruction = await buildCloseLongToPoolInstruction(params);
-  return { instructions: [instruction] };
+  const instructions = [instruction];
+
+  if (params.closeLongTokenAccount === true) {
+    instructions.push(
+      getCloseAccountInstruction(
+        params.buyerLongAccount,
+        params.buyer,
+        params.buyer
+      )
+    );
+  }
+
+  const shouldUnwrapPayout =
+    params.unwrapPayoutSol === true &&
+    toAddress(params.underlyingMint) === toAddress(NATIVE_MINT);
+  if (shouldUnwrapPayout) {
+    instructions.push(
+      getCloseAccountInstruction(
+        params.buyerPayoutAccount,
+        params.buyer,
+        params.buyer
+      )
+    );
+  }
+
+  return { instructions };
 }
 
 export interface BuildCloseLongToPoolTransactionWithDerivationParams {
@@ -358,13 +420,23 @@ export interface BuildCloseLongToPoolTransactionWithDerivationParams {
   buyer: AddressLike;
   buyerLongAccount: AddressLike;
   buyerPayoutAccount: AddressLike;
-  priceUpdate: AddressLike;
+  switchboardFeed?: AddressLike;
   quantity: bigint | number;
   minPayoutAmount: bigint | number;
   rpc: KitRpc;
   programId?: AddressLike;
   buyerPosition?: AddressLike;
   omlpVault?: AddressLike;
+  /**
+   * When true (default), appends CloseAccount for the buyer's LONG token account after close_long_to_pool.
+   * Set to false when doing a partial close (LONG ATA still holds remaining tokens).
+   */
+  closeLongTokenAccount?: boolean;
+  /**
+   * When true (default for WSOL underlying), appends CloseAccount to unwrap payout WSOL ATA to native SOL.
+   * Only applies when option underlying is WSOL.
+   */
+  unwrapPayoutSol?: boolean;
   remainingAccounts?: RemainingAccountInput[];
 }
 
@@ -396,6 +468,23 @@ export async function buildCloseLongToPoolTransactionWithDerivation(
         params.programId
       ))[0];
 
+  const isWsolUnderlying =
+    toAddress(resolved.underlyingMint!) === toAddress(NATIVE_MINT);
+  const closeLongTokenAccount =
+    params.closeLongTokenAccount !== false;
+  const unwrapPayoutSol =
+    params.unwrapPayoutSol !== false && isWsolUnderlying;
+  const marketDataAccount = await fetchMarketDataAccount(params.rpc, resolved.marketData);
+  invariant(
+    !!marketDataAccount,
+    "Market data account not found for resolved option market."
+  );
+  const switchboardFeed =
+    params.switchboardFeed ??
+    bs58.encode(
+      Array.from(marketDataAccount.switchboardFeedId as unknown as Uint8Array)
+    );
+
   return buildCloseLongToPoolTransaction({
     optionPool: resolved.optionPool,
     optionAccount: resolved.optionAccount,
@@ -405,7 +494,7 @@ export async function buildCloseLongToPoolTransactionWithDerivation(
     escrowLongAccount: resolved.escrowLongAccount!,
     premiumVault: resolved.premiumVault!,
     marketData: resolved.marketData,
-    priceUpdate: params.priceUpdate,
+    switchboardFeed,
     buyer: params.buyer,
     buyerLongAccount: params.buyerLongAccount,
     buyerPayoutAccount: params.buyerPayoutAccount,
@@ -414,6 +503,8 @@ export async function buildCloseLongToPoolTransactionWithDerivation(
     minPayoutAmount: params.minPayoutAmount,
     buyerPosition,
     omlpVault: params.omlpVault,
+    closeLongTokenAccount,
+    unwrapPayoutSol,
     remainingAccounts: params.remainingAccounts,
   });
 }

package/long/exercise.ts

@@ -8,7 +8,7 @@ export interface BuildOptionExerciseParams {
   positionAccount: AddressLike;
   marketData: AddressLike;
   underlyingMint: AddressLike;
-  priceUpdate: AddressLike;
+  switchboardFeed: AddressLike;
   buyerPaymentAccount: AddressLike;
   makerCollateralAccount: AddressLike;
   escrowState: AddressLike;
@@ -30,7 +30,7 @@ export function buildOptionExerciseInstruction(
     positionAccount: toAddress(params.positionAccount),
     marketData: toAddress(params.marketData),
     underlyingMint: toAddress(params.underlyingMint),
-    priceUpdate: toAddress(params.priceUpdate),
+    switchboardFeed: toAddress(params.switchboardFeed),
     buyerPaymentAccount: toAddress(params.buyerPaymentAccount),
     makerCollateralAccount: toAddress(params.makerCollateralAccount),
     escrowState: toAddress(params.escrowState),

package/omlp/builders.ts

@@ -6,6 +6,7 @@ import type { Instruction } from "@solana/kit";
 import { toAddress } from "../client/program";
 import type { AddressLike, BuiltTransaction } from "../client/types";
 import { assertPositiveAmount } from "../shared/amounts";
+import { getCloseAccountInstruction, NATIVE_MINT } from "../wsol/instructions";
 
 export interface BuildDepositToPositionParams {
   vault: AddressLike;
@@ -23,6 +24,8 @@ export interface BuildWithdrawFromPositionParams {
   lender: AddressLike;
   amount: bigint | number;
   position?: AddressLike;
+  unwrapSol?: boolean;
+  vaultMint?: AddressLike;
 }
 
 export async function buildDepositToPositionInstruction(
@@ -69,6 +72,23 @@ export async function buildWithdrawFromPositionInstruction(
 export async function buildWithdrawFromPositionTransaction(
   params: BuildWithdrawFromPositionParams
 ): Promise<BuiltTransaction> {
-  const instruction = await buildWithdrawFromPositionInstruction(params);
-  return { instructions: [instruction] };
+  const withdrawInstruction = await buildWithdrawFromPositionInstruction(params);
+  const instructions: Instruction<string>[] = [withdrawInstruction];
+
+  const shouldUnwrapSol =
+    params.unwrapSol === true &&
+    params.vaultMint !== undefined &&
+    toAddress(params.vaultMint) === toAddress(NATIVE_MINT);
+
+  if (shouldUnwrapSol) {
+    instructions.push(
+      getCloseAccountInstruction(
+        params.lenderTokenAccount,
+        params.lender,
+        params.lender
+      )
+    );
+  }
+
+  return { instructions };
 }

package/omlp/service.ts

@@ -12,10 +12,25 @@ import {
   type BuildWithdrawFromPositionParams,
 } from "./builders";
 
+const INTEREST_FP_SCALE = 1_000_000_000_000n;
+
 function positiveDiff(a: bigint, b: bigint): bigint {
   return a > b ? a - b : 0n;
 }
 
+function calculatePendingInterest(
+  deposited: bigint,
+  vaultAccInterestPerShareFp: bigint,
+  positionInterestIndexSnapshotFp: bigint
+): bigint {
+  const deltaFp = positiveDiff(
+    vaultAccInterestPerShareFp,
+    positionInterestIndexSnapshotFp
+  );
+
+  return (deposited * deltaFp) / INTEREST_FP_SCALE;
+}
+
 export async function depositToPosition(
   params: BuildDepositToPositionParams
 ) {
@@ -50,14 +65,23 @@ export async function withdrawAllFromPosition(
     position.totalInterestEarned,
     position.interestClaimed
   );
-  const userMax = position.deposited + unclaimedInterest;
+  const pendingInterest = calculatePendingInterest(
+    position.deposited,
+    vault.accInterestPerShareFp,
+    position.interestIndexSnapshotFp
+  );
+  const userMax = position.deposited + unclaimedInterest + pendingInterest;
   const poolAvailable = positiveDiff(vault.totalLiquidity, vault.totalLoans);
   const amount = userMax < poolAvailable ? userMax : poolAvailable;
   if (amount <= 0n) {
     throw new Error("No withdrawable balance available right now.");
   }
 
-  const built = await buildWithdrawFromPositionTransaction({ ...params, amount });
+  const built = await buildWithdrawFromPositionTransaction({
+    ...params,
+    amount,
+    vaultMint: vault.mint,
+  });
   return { instructions: built.instructions, amount };
 }
 
@@ -83,13 +107,26 @@ export async function withdrawInterestFromPosition(
     position.totalInterestEarned,
     position.interestClaimed
   );
+  const pendingInterest = calculatePendingInterest(
+    position.deposited,
+    vault.accInterestPerShareFp,
+    position.interestIndexSnapshotFp
+  );
+  const totalClaimableInterest = unclaimedInterest + pendingInterest;
   const poolAvailable = positiveDiff(vault.totalLiquidity, vault.totalLoans);
-  const amount = unclaimedInterest < poolAvailable ? unclaimedInterest : poolAvailable;
+  const amount =
+    totalClaimableInterest < poolAvailable
+      ? totalClaimableInterest
+      : poolAvailable;
   if (amount <= 0n) {
     throw new Error("No claimable interest available right now.");
   }
 
-  const built = await buildWithdrawFromPositionTransaction({ ...params, amount });
+  const built = await buildWithdrawFromPositionTransaction({
+    ...params,
+    amount,
+    vaultMint: vault.mint,
+  });
   return { instructions: built.instructions, amount };
 }
 

package/oracle/switchboard.ts

@@ -0,0 +1,56 @@
+import type { Address } from "@solana/kit";
+import bs58 from "bs58";
+import { toAddress } from "../client/program";
+import type { AddressLike, KitRpc } from "../client/types";
+import { fetchMarketDataAccount } from "../accounts/fetchers";
+import { invariant } from "../shared/errors";
+
+export async function resolveSwitchboardFeedFromMarketData(
+  rpc: KitRpc,
+  marketData: AddressLike
+): Promise<Address> {
+  const account = await fetchMarketDataAccount(rpc, marketData);
+  invariant(!!account, "Market data account not found.");
+  return toAddress(
+    bs58.encode(
+      Array.from(account.switchboardFeedId as unknown as Uint8Array)
+    )
+  );
+}
+
+export interface SwitchboardPullFeedLike<TInstruction = unknown, TLookupTable = unknown> {
+  fetchUpdateIx(args: {
+    crossbarClient: unknown;
+    chain?: "solana";
+    network?: "devnet" | "mainnet";
+  }): Promise<[TInstruction | null, unknown, unknown, TLookupTable[]]>;
+}
+
+export interface BuildSwitchboardPullFeedUpdateParams<
+  TInstruction = unknown,
+  TLookupTable = unknown,
+> {
+  pullFeed: SwitchboardPullFeedLike<TInstruction, TLookupTable>;
+  crossbarClient: unknown;
+  chain?: "solana";
+  network?: "devnet" | "mainnet";
+}
+
+export async function buildSwitchboardPullFeedUpdate<
+  TInstruction = unknown,
+  TLookupTable = unknown,
+>(
+  params: BuildSwitchboardPullFeedUpdateParams<TInstruction, TLookupTable>
+): Promise<{ updateInstructions: TInstruction[]; lookupTables: TLookupTable[] }> {
+  const [pullIx, _responses, _success, luts] = await params.pullFeed.fetchUpdateIx({
+    crossbarClient: params.crossbarClient,
+    chain: params.chain ?? "solana",
+    network: params.network,
+  });
+
+  const updateInstructions: TInstruction[] = pullIx ? [pullIx] : [];
+  return {
+    updateInstructions,
+    lookupTables: luts ?? [],
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.5.0-alpha.8",
+  "version": "0.6.1-alpha",
   "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

@@ -8,7 +8,7 @@ import {
 import type { Instruction, TransactionSigner } from "@solana/kit";
 import { toAddress } from "../client/program";
 import type { AddressLike, BuiltTransaction, KitRpc } from "../client/types";
-import { fetchVault } from "../accounts/fetchers";
+import { fetchMarketDataAccount, fetchVault } from "../accounts/fetchers";
 import { fetchPoolLoansByMaker } from "../accounts/list";
 import { resolveOptionAccounts } from "../accounts/resolve-option";
 import {
@@ -25,11 +25,13 @@ import {
   type RemainingAccountInput,
 } from "../shared/remaining-accounts";
 import {
+  getCloseAccountInstruction,
   NATIVE_MINT,
   getCreateAssociatedTokenIdempotentInstructionWithAddress,
   getWrapSOLInstructions,
 } from "../wsol/instructions";
 import { preflightUnwindWriterUnsold } from "./preflight";
+import bs58 from "bs58";
 
 export interface BuildOptionMintParams {
   optionType: OptionType;
@@ -49,11 +51,8 @@ export interface BuildOptionMintParams {
   maker: AddressLike;
   makerCollateralAccount: AddressLike;
   underlyingMint: AddressLike;
-  /**
-   * Pyth price update account for collateral calculation.
-   * Required to convert USD collateral requirement to token units.
-   */
-  priceUpdate: AddressLike;
+  /** Switchboard pull feed account for collateral calculation. */
+  switchboardFeed: AddressLike;
   longMetadataAccount?: AddressLike;
   shortMetadataAccount?: AddressLike;
   optionAccount?: AddressLike;
@@ -75,6 +74,12 @@ export interface BuildOptionMintParams {
   escrowAuthority?: AddressLike;
   escrowTokenAccount?: AddressLike;
   poolLoan?: AddressLike;
+  /**
+   * When true (default), appends an SPL CloseAccount instruction after option_mint to close the
+   * maker's LONG token account (reclaim rent). The program transfers all LONG to escrow, so the
+   * maker's LONG ATA is left with zero balance and can be closed in the same transaction.
+   */
+  closeMakerLongAccount?: boolean;
   remainingAccounts?: RemainingAccountInput[];
 }
 
@@ -193,7 +198,7 @@ export async function buildOptionMintInstruction(
       ? toAddress(params.escrowTokenAccount)
       : undefined,
     poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
-    priceUpdate: toAddress(params.priceUpdate),
+    switchboardFeed: toAddress(params.switchboardFeed),
     maker: toAddress(params.maker) as any,
     optionType: params.optionType,
     strikePrice: params.strikePrice,
@@ -213,7 +218,21 @@ export async function buildOptionMintTransaction(
   params: BuildOptionMintParams
 ): Promise<BuiltTransaction> {
   const instruction = await buildOptionMintInstruction(params);
-  return { instructions: [instruction] };
+  const instructions: Instruction<string>[] = [instruction];
+
+  const shouldCloseMakerLong =
+    params.closeMakerLongAccount !== false && params.makerLongAccount != null;
+  if (shouldCloseMakerLong) {
+    instructions.push(
+      getCloseAccountInstruction(
+        params.makerLongAccount!,
+        params.maker,
+        params.maker
+      )
+    );
+  }
+
+  return { instructions };
 }
 
 export interface BuildOptionMintTransactionWithDerivationParams {
@@ -238,11 +257,8 @@ export interface BuildOptionMintTransactionWithDerivationParams {
    * (or underlyingMint if collateralMint is not provided).
    */
   makerCollateralAccount?: AddressLike;
-  /**
-   * Pyth price update account for collateral calculation.
-   * Required to convert USD collateral requirement to token units.
-   */
-  priceUpdate: AddressLike;
+  /** Optional explicit Switchboard feed account override. */
+  switchboardFeed?: AddressLike;
   rpc: KitRpc;
   programId?: AddressLike;
   vault?: AddressLike;
@@ -294,6 +310,16 @@ export async function buildOptionMintTransactionWithDerivation(
   const makerCollateralAccount = params.makerCollateralAccount
     ? toAddress(params.makerCollateralAccount)
     : await deriveAssociatedTokenAddress(params.maker, collateralMint);
+  const marketDataAccount = await fetchMarketDataAccount(params.rpc, resolved.marketData);
+  invariant(
+    !!marketDataAccount,
+    "Market data account not found for resolved option market."
+  );
+  const switchboardFeed =
+    params.switchboardFeed ??
+    bs58.encode(
+      Array.from(marketDataAccount.switchboardFeedId as unknown as Uint8Array)
+    );
 
   const tx = await buildOptionMintTransaction({
     ...params,
@@ -313,6 +339,7 @@ export async function buildOptionMintTransactionWithDerivation(
     premiumVault: resolved.premiumVault,
     collateralPool: resolved.collateralPool,
     collateralVault: resolved.collateralVault,
+    switchboardFeed,
     vault: params.vault,
     vaultTokenAccount: params.vaultTokenAccount,
     escrowState: params.escrowState,