@epicentral/sos-sdk 0.11.0-beta → 0.11.2-beta

package/accounts/fetchers.ts

@@ -96,7 +96,12 @@ export async function fetchAccountData(
   rpc: KitRpc,
   address: AddressLike
 ): Promise<Uint8Array | null> {
-  const response = await rpc.getAccountInfo(toAddress(address), { encoding: "base64" }).send();
+  const response = await rpc
+    .getAccountInfo(toAddress(address), {
+      encoding: "base64",
+      commitment: "confirmed",
+    })
+    .send();
   const accountInfo = response.value;
   if (!accountInfo) return null;
   const [data] = accountInfo.data;
@@ -201,7 +206,12 @@ export async function accountExists(
   rpc: KitRpc,
   address: AddressLike
 ): Promise<boolean> {
-  const response = await rpc.getAccountInfo(toAddress(address), { encoding: "base64" }).send();
+  const response = await rpc
+    .getAccountInfo(toAddress(address), {
+      encoding: "base64",
+      commitment: "confirmed",
+    })
+    .send();
   return response.value !== null;
 }
 
@@ -210,7 +220,9 @@ export async function fetchManyAccounts(
   addresses: AddressLike[]
 ): Promise<Array<{ address: Address; exists: boolean }>> {
   const keys = addresses.map((value) => toAddress(value));
-  const response = await rpc.getMultipleAccounts(keys, { encoding: "base64" }).send();
+  const response = await rpc
+    .getMultipleAccounts(keys, { encoding: "base64", commitment: "confirmed" })
+    .send();
   const infos = response.value;
   return keys.map((key, index) => ({
     address: key,
@@ -230,7 +242,9 @@ export async function fetchOptionAccounts(
 ): Promise<Map<Address, OptionAccount | null>> {
   if (addresses.length === 0) return new Map();
   const keys = addresses.map((value) => toAddress(value));
-  const response = await rpc.getMultipleAccounts(keys, { encoding: "base64" }).send();
+  const response = await rpc
+    .getMultipleAccounts(keys, { encoding: "base64", commitment: "confirmed" })
+    .send();
   const infos = response.value;
   const result = new Map<Address, OptionAccount | null>();
   for (let i = 0; i < keys.length; i++) {

package/accounts/list.ts

@@ -89,6 +89,7 @@ async function fetchAndDecodeProgramAccounts<T>(
   const response = await rpc
     .getProgramAccounts(toAddress(programAddress), {
       encoding: "base64",
+      commitment: "confirmed",
       filters: filters as never,
     })
     .send();
@@ -158,13 +159,19 @@ export async function fetchPositionAccountsByBuyer(
 
 export async function fetchPoolLoansByMaker(
   rpc: KitRpc,
-  maker: AddressLike
+  maker: AddressLike,
+  programId?: AddressLike
 ): Promise<Array<ListedAccount<PoolLoan>>> {
-  const decoded = await fetchAndDecodeProgramAccounts(rpc, getPoolLoanDecoder(), [
-    discriminatorFilter(POOL_LOAN_DISCRIMINATOR),
-    ownerFilter(maker),
-    { dataSize: BigInt(getPoolLoanSize()) },
-  ]);
+  const decoded = await fetchAndDecodeProgramAccounts(
+    rpc,
+    getPoolLoanDecoder(),
+    [
+      discriminatorFilter(POOL_LOAN_DISCRIMINATOR),
+      ownerFilter(maker),
+      { dataSize: BigInt(getPoolLoanSize()) },
+    ],
+    programId ?? PROGRAM_ID
+  );
   return decoded.filter(
     (item: { address: Address; data: PoolLoan }) =>
       item.data.status === ACTIVE_POOL_LOAN_STATUS

package/index.ts

@@ -5,9 +5,11 @@ export { OptionType } from "./generated/types";
 
 export type { OptionAccount } from "./generated/accounts/optionAccount";
 export {
+  identifyOptionProgramInstruction,
   OptionProgramInstruction,
-  parseOptionProgramInstruction,
+  type ParsedOptionProgramInstruction,
 } from "./generated/programs/optionProgram";
+export { parseOptionProgramInstruction } from "./shared/option-program-parser";
 
 export * from "./accounts/pdas";
 export * from "./accounts/fetchers";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.11.0-beta",
+  "version": "0.11.2-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/shared/option-program-parser.ts

@@ -0,0 +1,317 @@
+import type {
+  AccountMeta,
+  Instruction,
+  InstructionWithAccounts,
+  InstructionWithData,
+  ReadonlyUint8Array,
+} from "@solana/kit";
+import {
+  parseAcceptAdminInstruction,
+  parseAutoExerciseAllExpiredInstruction,
+  parseAutoExerciseExpiredInstruction,
+  parseBorrowFromPoolInstruction,
+  parseBuyFromPoolInstruction,
+  parseClaimBuyerSettlementInstruction,
+  parseClaimMakerRemainingInstruction,
+  parseClaimMakerSettlementInstruction,
+  parseCloseLongToPoolInstruction,
+  parseCloseOptionInstruction,
+  parseCreateEscrowV2Instruction,
+  parseDepositCollateralInstruction,
+  parseDepositToPositionInstruction,
+  parseInitCollateralPoolInstruction,
+  parseInitConfigInstruction,
+  parseInitializeMarketDataInstruction,
+  parseInitOptionPoolInstruction,
+  parseLiquidateWriterPositionInstruction,
+  parseLiquidateWriterPositionRescueInstruction,
+  parseMigrateCollateralPoolV1ToV2Instruction,
+  parseOmlpCreateVaultInstruction,
+  parseOmlpUpdateFeeWalletInstruction,
+  parseOmlpUpdateInterestModelInstruction,
+  parseOmlpUpdateLiquidationThresholdInstruction,
+  parseOmlpUpdateMaintenanceBufferInstruction,
+  parseOmlpUpdateMaxBorrowCapInstruction,
+  parseOmlpUpdateMaxLeverageInstruction,
+  parseOmlpUpdateProtocolFeeInstruction,
+  parseOmlpUpdateSupplyLimitInstruction,
+  parseOptionExerciseInstruction,
+  parseOptionMintInstruction,
+  parseOptionValidateInstruction,
+  parsePrepareBuyerSettlementInstruction,
+  parsePrepareMakerSettlementInstruction,
+  parseRepayPoolLoanFromCollateralInstruction,
+  parseRepayPoolLoanFromWalletInstruction,
+  parseRepayPoolLoanInstruction,
+  parseSettleMakerCollateralInstruction,
+  parseSyncWriterPositionInstruction,
+  parseTransferAdminInstruction,
+  parseUnwindWriterUnsoldInstruction,
+  parseUpdateImpliedVolatilityInstruction,
+  parseUpdateMarketDataInstruction,
+  parseWithdrawFromPositionInstruction,
+  parseWriteToPoolInstruction,
+} from "../generated/instructions";
+import {
+  identifyOptionProgramInstruction,
+  OptionProgramInstruction,
+  type ParsedOptionProgramInstruction,
+} from "../generated/programs/optionProgram";
+
+type OptionProgramInstructionInput<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+> = Instruction<TProgram> &
+  InstructionWithAccounts<TAccountMetas> &
+  InstructionWithData<ReadonlyUint8Array>;
+
+function withInstructionType<TProgram extends string>(
+  parsed: Omit<ParsedOptionProgramInstruction<TProgram>, "instructionType">,
+  instructionType: ParsedOptionProgramInstruction<TProgram>["instructionType"],
+): ParsedOptionProgramInstruction<TProgram> {
+  return {
+    instructionType,
+    ...parsed,
+  } as ParsedOptionProgramInstruction<TProgram>;
+}
+
+export function parseOptionProgramInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: OptionProgramInstructionInput<TProgram, TAccountMetas>,
+): ParsedOptionProgramInstruction<TProgram> {
+  const instructionType = identifyOptionProgramInstruction(instruction);
+
+  switch (instructionType) {
+    case OptionProgramInstruction.AcceptAdmin:
+      return withInstructionType(
+        parseAcceptAdminInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.AutoExerciseAllExpired:
+      return withInstructionType(
+        parseAutoExerciseAllExpiredInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.AutoExerciseExpired:
+      return withInstructionType(
+        parseAutoExerciseExpiredInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.BorrowFromPool:
+      return withInstructionType(
+        parseBorrowFromPoolInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.BuyFromPool:
+      return withInstructionType(
+        parseBuyFromPoolInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.ClaimBuyerSettlement:
+      return withInstructionType(
+        parseClaimBuyerSettlementInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.ClaimMakerRemaining:
+      return withInstructionType(
+        parseClaimMakerRemainingInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.ClaimMakerSettlement:
+      return withInstructionType(
+        parseClaimMakerSettlementInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.CloseLongToPool:
+      return withInstructionType(
+        parseCloseLongToPoolInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.CloseOption:
+      return withInstructionType(
+        parseCloseOptionInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.CreateEscrowV2:
+      return withInstructionType(
+        parseCreateEscrowV2Instruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.DepositCollateral:
+      return withInstructionType(
+        parseDepositCollateralInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.DepositToPosition:
+      return withInstructionType(
+        parseDepositToPositionInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.InitCollateralPool:
+      return withInstructionType(
+        parseInitCollateralPoolInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.InitConfig:
+      return withInstructionType(
+        parseInitConfigInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.InitOptionPool:
+      return withInstructionType(
+        parseInitOptionPoolInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.InitializeMarketData:
+      return withInstructionType(
+        parseInitializeMarketDataInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.LiquidateWriterPosition:
+      return withInstructionType(
+        parseLiquidateWriterPositionInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.LiquidateWriterPositionRescue:
+      return withInstructionType(
+        parseLiquidateWriterPositionRescueInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.MigrateCollateralPoolV1ToV2:
+      return withInstructionType(
+        parseMigrateCollateralPoolV1ToV2Instruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpCreateVault:
+      return withInstructionType(
+        parseOmlpCreateVaultInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateFeeWallet:
+      return withInstructionType(
+        parseOmlpUpdateFeeWalletInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateInterestModel:
+      return withInstructionType(
+        parseOmlpUpdateInterestModelInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateLiquidationThreshold:
+      return withInstructionType(
+        parseOmlpUpdateLiquidationThresholdInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateMaintenanceBuffer:
+      return withInstructionType(
+        parseOmlpUpdateMaintenanceBufferInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateMaxBorrowCap:
+      return withInstructionType(
+        parseOmlpUpdateMaxBorrowCapInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateMaxLeverage:
+      return withInstructionType(
+        parseOmlpUpdateMaxLeverageInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateProtocolFee:
+      return withInstructionType(
+        parseOmlpUpdateProtocolFeeInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OmlpUpdateSupplyLimit:
+      return withInstructionType(
+        parseOmlpUpdateSupplyLimitInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OptionExercise:
+      return withInstructionType(
+        parseOptionExerciseInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OptionMint:
+      return withInstructionType(
+        parseOptionMintInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.OptionValidate:
+      return withInstructionType(
+        parseOptionValidateInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.PrepareBuyerSettlement:
+      return withInstructionType(
+        parsePrepareBuyerSettlementInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.PrepareMakerSettlement:
+      return withInstructionType(
+        parsePrepareMakerSettlementInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.RepayPoolLoan:
+      return withInstructionType(
+        parseRepayPoolLoanInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.RepayPoolLoanFromCollateral:
+      return withInstructionType(
+        parseRepayPoolLoanFromCollateralInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.RepayPoolLoanFromWallet:
+      return withInstructionType(
+        parseRepayPoolLoanFromWalletInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.SettleMakerCollateral:
+      return withInstructionType(
+        parseSettleMakerCollateralInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.SyncWriterPosition:
+      return withInstructionType(
+        parseSyncWriterPositionInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.TransferAdmin:
+      return withInstructionType(
+        parseTransferAdminInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.UnwindWriterUnsold:
+      return withInstructionType(
+        parseUnwindWriterUnsoldInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.UpdateImpliedVolatility:
+      return withInstructionType(
+        parseUpdateImpliedVolatilityInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.UpdateMarketData:
+      return withInstructionType(
+        parseUpdateMarketDataInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.WithdrawFromPosition:
+      return withInstructionType(
+        parseWithdrawFromPositionInstruction(instruction),
+        instructionType,
+      );
+    case OptionProgramInstruction.WriteToPool:
+      return withInstructionType(
+        parseWriteToPoolInstruction(instruction),
+        instructionType,
+      );
+    default: {
+      const exhaustiveCheck: never = instructionType;
+      throw new Error(`Unsupported option program instruction: ${exhaustiveCheck}`);
+    }
+  }
+}

package/short/builders.ts

@@ -11,7 +11,7 @@ import {
   type OptionType,
 } from "../generated";
 import type { Instruction, TransactionSigner } from "@solana/kit";
-import { toAddress } from "../client/program";
+import { PROGRAM_ID, toAddress } from "../client/program";
 import type { AddressLike, BuiltTransaction, KitRpc } from "../client/types";
 import { fetchMarketDataAccount, fetchVault, fetchWriterPosition } from "../accounts/fetchers";
 import { fetchPoolLoansByMaker } from "../accounts/list";
@@ -87,6 +87,8 @@ export interface BuildOptionMintParams {
   escrowAuthority?: AddressLike;
   escrowTokenAccount?: AddressLike;
   poolLoan?: AddressLike;
+  /** Override program id for instruction encoding (must match PDA derivation program). */
+  programId?: 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
@@ -239,53 +241,56 @@ export async function buildOptionMintInstruction(
     "longMetadataAccount and shortMetadataAccount are required (or provide longMint/shortMint to derive)."
   );
 
-  const kitInstruction = await getOptionMintInstructionAsync({
-    optionAccount: params.optionAccount ? toAddress(params.optionAccount) : undefined,
-    longMint: params.longMint ? toAddress(params.longMint) : undefined,
-    shortMint: params.shortMint ? toAddress(params.shortMint) : undefined,
-    mintAuthority: params.mintAuthority ? toAddress(params.mintAuthority) : undefined,
-    makerLongAccount: params.makerLongAccount
-      ? toAddress(params.makerLongAccount)
-      : undefined,
-    makerShortAccount: params.makerShortAccount
-      ? toAddress(params.makerShortAccount)
-      : undefined,
-    longMetadataAccount: toAddress(longMetadata!),
-    shortMetadataAccount: toAddress(shortMetadata!),
-    marketData: params.marketData ? toAddress(params.marketData) : undefined,
-    underlyingMint: toAddress(params.underlyingMint),
-    collateralMint: toAddress(params.collateralMint ?? params.underlyingMint),
-    optionPool: params.optionPool ? toAddress(params.optionPool) : undefined,
-    escrowLongAccount: params.escrowLongAccount
-      ? toAddress(params.escrowLongAccount)
-      : undefined,
-    premiumVault: params.premiumVault ? toAddress(params.premiumVault) : undefined,
-    collateralPool: params.collateralPool ? toAddress(params.collateralPool) : undefined,
-    collateralVault: params.collateralVault ? toAddress(params.collateralVault) : undefined,
-    makerCollateralAccount: toAddress(params.makerCollateralAccount),
-    writerPosition: params.writerPosition ? toAddress(params.writerPosition) : undefined,
-    vault: params.vault ? toAddress(params.vault) : undefined,
-    vaultTokenAccount: params.vaultTokenAccount
-      ? toAddress(params.vaultTokenAccount)
-      : undefined,
-    escrowState: params.escrowState ? toAddress(params.escrowState) : undefined,
-    escrowAuthority: params.escrowAuthority ? toAddress(params.escrowAuthority) : undefined,
-    escrowTokenAccount: params.escrowTokenAccount
-      ? toAddress(params.escrowTokenAccount)
-      : undefined,
-    poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
-    maker: toAddress(params.maker) as any,
-    optionType: params.optionType,
-    strikePrice: params.strikePrice,
-    expirationDate: params.expirationDate,
-    quantity: params.quantity,
-    underlyingAsset: toAddress(params.underlyingAsset),
-    underlyingSymbol: params.underlyingSymbol,
-    collateralMintArg: toAddress(params.collateralMint ?? params.underlyingMint),
-    makerCollateralAmount: params.makerCollateralAmount,
-    borrowedAmount: params.borrowedAmount,
-    maxRequiredCollateralAmount,
-  });
+  const kitInstruction = await getOptionMintInstructionAsync(
+    {
+      optionAccount: params.optionAccount ? toAddress(params.optionAccount) : undefined,
+      longMint: params.longMint ? toAddress(params.longMint) : undefined,
+      shortMint: params.shortMint ? toAddress(params.shortMint) : undefined,
+      mintAuthority: params.mintAuthority ? toAddress(params.mintAuthority) : undefined,
+      makerLongAccount: params.makerLongAccount
+        ? toAddress(params.makerLongAccount)
+        : undefined,
+      makerShortAccount: params.makerShortAccount
+        ? toAddress(params.makerShortAccount)
+        : undefined,
+      longMetadataAccount: toAddress(longMetadata!),
+      shortMetadataAccount: toAddress(shortMetadata!),
+      marketData: params.marketData ? toAddress(params.marketData) : undefined,
+      underlyingMint: toAddress(params.underlyingMint),
+      collateralMint: toAddress(params.collateralMint ?? params.underlyingMint),
+      optionPool: params.optionPool ? toAddress(params.optionPool) : undefined,
+      escrowLongAccount: params.escrowLongAccount
+        ? toAddress(params.escrowLongAccount)
+        : undefined,
+      premiumVault: params.premiumVault ? toAddress(params.premiumVault) : undefined,
+      collateralPool: params.collateralPool ? toAddress(params.collateralPool) : undefined,
+      collateralVault: params.collateralVault ? toAddress(params.collateralVault) : undefined,
+      makerCollateralAccount: toAddress(params.makerCollateralAccount),
+      writerPosition: params.writerPosition ? toAddress(params.writerPosition) : undefined,
+      vault: params.vault ? toAddress(params.vault) : undefined,
+      vaultTokenAccount: params.vaultTokenAccount
+        ? toAddress(params.vaultTokenAccount)
+        : undefined,
+      escrowState: params.escrowState ? toAddress(params.escrowState) : undefined,
+      escrowAuthority: params.escrowAuthority ? toAddress(params.escrowAuthority) : undefined,
+      escrowTokenAccount: params.escrowTokenAccount
+        ? toAddress(params.escrowTokenAccount)
+        : undefined,
+      poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
+      maker: toAddress(params.maker) as any,
+      optionType: params.optionType,
+      strikePrice: params.strikePrice,
+      expirationDate: params.expirationDate,
+      quantity: params.quantity,
+      underlyingAsset: toAddress(params.underlyingAsset),
+      underlyingSymbol: params.underlyingSymbol,
+      collateralMintArg: toAddress(params.collateralMint ?? params.underlyingMint),
+      makerCollateralAmount: params.makerCollateralAmount,
+      borrowedAmount: params.borrowedAmount,
+      maxRequiredCollateralAmount,
+    },
+    { programAddress: params.programId ? toAddress(params.programId) : PROGRAM_ID }
+  );
 
   const quoteVerificationAccounts: RemainingAccountInput[] = [
     {
@@ -452,15 +457,10 @@ export async function buildOptionMintTransactionWithDerivation(
     params.programId
   );
 
-  // option_mint + borrow: `sync_collateral_pool_debt` requires
-  //   snapshot.active_loan_count == writer.active_loan_count
-  // after the writer block (+1 for this borrow). The named `pool_loan` is the new loan from
-  // TX A. gPA can return more PoolLoans than `writer.active_loan_count` (on-chain desync
-  // or stale actives). We pass exactly `activeLoanCount` pre-ix prior loans, excluding the
-  // new `pool_loan`, matching `writer_position` (and preferring same vault) with canonical
-  // `toAddress` equality. Prefer *higher* `nonce` first so we do not pick a stale low-nonce
-  // account that the sync path skips (discriminator / borrow_mut), which yields under-count
-  // and 6102.
+  // option_mint + borrow: `sync_collateral_pool_debt` needs the active loan snapshot.
+  // The named `pool_loan` is the freshly borrowed loan from TX A; pass only the prior
+  // active loans as remaining accounts. If confirmed gPA already sees the new loan,
+  // subtract it from `writer.activeLoanCount` so it is not double-counted.
   let priorActivePoolLoans: RemainingAccountInput[] = [];
   if (borrowedAmount > 0n) {
     const wp = toAddress(writerPositionPdaForIx);
@@ -468,9 +468,16 @@ export async function buildOptionMintTransactionWithDerivation(
     const vaultPda = toAddress(params.vault!);
     const [writerPos, activeLoans] = await Promise.all([
       fetchWriterPosition(params.rpc, writerPositionPdaForIx),
-      fetchPoolLoansByMaker(params.rpc, params.maker),
+      fetchPoolLoansByMaker(params.rpc, params.maker, params.programId),
     ]);
-    const priorCount = writerPos?.activeLoanCount ?? 0;
+    const newLoanAlreadyActive = activeLoans.some(
+      (loan) => toAddress(loan.address) === newLoan
+    );
+    const activeLoanCount = writerPos?.activeLoanCount ?? 0;
+    const priorCount = Math.max(
+      0,
+      activeLoanCount - (newLoanAlreadyActive ? 1 : 0)
+    );
     const forWriter = (l: (typeof activeLoans)[0]) =>
       toAddress(l.data.writerPosition) === wp && toAddress(l.address) !== newLoan;
     const sortByNonceDesc = (
@@ -669,7 +676,7 @@ export async function buildUnwindWriterUnsoldWithLoanRepayment(
   );
 
   const [loans, vault, writerPosition] = await Promise.all([
-    fetchPoolLoansByMaker(params.rpc, params.writer),
+    fetchPoolLoansByMaker(params.rpc, params.writer, params.programId),
     fetchVault(params.rpc, vaultPda),
     fetchWriterPosition(params.rpc, writerPositionAddress),
   ]);

package/short/preflight.ts

@@ -274,7 +274,7 @@ export async function preflightUnwindWriterUnsold(
   writerPosition = await fetchWriterPosition(params.rpc, writerPositionAddress);
   collateralPool = await fetchCollateralPool(params.rpc, resolved.collateralPool);
   vault = await fetchVault(params.rpc, vaultPda);
-  loans = await fetchPoolLoansByMaker(params.rpc, params.writer);
+  loans = await fetchPoolLoansByMaker(params.rpc, params.writer, params.programId);
   currentSlot = await params.rpc.getSlot().send();
 
   invariant(!!writerPosition, "Writer position is required for unwind preflight.");