@epicentral/sos-sdk 0.13.2-beta → 0.14.1-beta

package/generated/programs/optionProgram.ts

@@ -7,62 +7,13 @@
  */
 
 import {
-  assertIsInstructionWithAccounts,
   containsBytes,
   fixEncoderSize,
   getBytesEncoder,
   type Address,
-  type Instruction,
-  type InstructionWithData,
   type 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,
-  parseMigrateMarketDataVolOracleInstruction,
-  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,
   type ParsedAcceptAdminInstruction,
   type ParsedAutoExerciseAllExpiredInstruction,
   type ParsedAutoExerciseExpiredInstruction,
@@ -104,6 +55,7 @@ import {
   type ParsedSettleMakerCollateralInstruction,
   type ParsedSyncWriterPositionInstruction,
   type ParsedTransferAdminInstruction,
+  type ParsedTransferMarketDataAuthorityInstruction,
   type ParsedUnwindWriterUnsoldInstruction,
   type ParsedUpdateImpliedVolatilityInstruction,
   type ParsedUpdateMarketDataInstruction,
@@ -336,6 +288,7 @@ export enum OptionProgramInstruction {
   SettleMakerCollateral,
   SyncWriterPosition,
   TransferAdmin,
+  TransferMarketDataAuthority,
   UnwindWriterUnsold,
   UpdateImpliedVolatility,
   UpdateMarketData,
@@ -798,6 +751,17 @@ export function identifyOptionProgramInstruction(
   ) {
     return OptionProgramInstruction.TransferAdmin;
   }
+  if (
+    containsBytes(
+      data,
+      fixEncoderSize(getBytesEncoder(), 8).encode(
+        new Uint8Array([81, 39, 144, 5, 135, 201, 220, 167]),
+      ),
+      0,
+    )
+  ) {
+    return OptionProgramInstruction.TransferMarketDataAuthority;
+  }
   if (
     containsBytes(
       data,
@@ -984,6 +948,9 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.TransferAdmin;
     } & ParsedTransferAdminInstruction<TProgram>)
+  | ({
+      instructionType: OptionProgramInstruction.TransferMarketDataAuthority;
+    } & ParsedTransferMarketDataAuthorityInstruction<TProgram>)
   | ({
       instructionType: OptionProgramInstruction.UnwindWriterUnsold;
     } & ParsedUnwindWriterUnsoldInstruction<TProgram>)
@@ -999,338 +966,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.ClaimBuyerSettlement: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.ClaimBuyerSettlement,
-        ...parseClaimBuyerSettlementInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.ClaimMakerRemaining: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.ClaimMakerRemaining,
-        ...parseClaimMakerRemainingInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.ClaimMakerSettlement: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.ClaimMakerSettlement,
-        ...parseClaimMakerSettlementInstruction(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.MigrateMarketDataVolOracle: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.MigrateMarketDataVolOracle,
-        ...parseMigrateMarketDataVolOracleInstruction(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.PrepareBuyerSettlement: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.PrepareBuyerSettlement,
-        ...parsePrepareBuyerSettlementInstruction(instruction),
-      };
-    }
-    case OptionProgramInstruction.PrepareMakerSettlement: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.PrepareMakerSettlement,
-        ...parsePrepareMakerSettlementInstruction(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/generated/types/index.ts

@@ -9,6 +9,7 @@
 export * from "./impliedVolatilityUpdated";
 export * from "./liquidationExecuted";
 export * from "./liquidationRescueEvent";
+export * from "./marketDataAuthorityTransferred";
 export * from "./marketDataInitialized";
 export * from "./marketDataUpdated";
 export * from "./optionClosed";

package/generated/types/marketDataAuthorityTransferred.ts

@@ -0,0 +1,56 @@
+/**
+ * This code was AUTOGENERATED using the Codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun Codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+
+import {
+  combineCodec,
+  getAddressDecoder,
+  getAddressEncoder,
+  getStructDecoder,
+  getStructEncoder,
+  type Address,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
+} from "@solana/kit";
+
+export type MarketDataAuthorityTransferred = {
+  marketData: Address;
+  underlyingAsset: Address;
+  previousAuthority: Address;
+  newAuthority: Address;
+};
+
+export type MarketDataAuthorityTransferredArgs = MarketDataAuthorityTransferred;
+
+export function getMarketDataAuthorityTransferredEncoder(): FixedSizeEncoder<MarketDataAuthorityTransferredArgs> {
+  return getStructEncoder([
+    ["marketData", getAddressEncoder()],
+    ["underlyingAsset", getAddressEncoder()],
+    ["previousAuthority", getAddressEncoder()],
+    ["newAuthority", getAddressEncoder()],
+  ]);
+}
+
+export function getMarketDataAuthorityTransferredDecoder(): FixedSizeDecoder<MarketDataAuthorityTransferred> {
+  return getStructDecoder([
+    ["marketData", getAddressDecoder()],
+    ["underlyingAsset", getAddressDecoder()],
+    ["previousAuthority", getAddressDecoder()],
+    ["newAuthority", getAddressDecoder()],
+  ]);
+}
+
+export function getMarketDataAuthorityTransferredCodec(): FixedSizeCodec<
+  MarketDataAuthorityTransferredArgs,
+  MarketDataAuthorityTransferred
+> {
+  return combineCodec(
+    getMarketDataAuthorityTransferredEncoder(),
+    getMarketDataAuthorityTransferredDecoder(),
+  );
+}

package/package.json

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

@@ -47,6 +47,7 @@ import {
   parseSettleMakerCollateralInstruction,
   parseSyncWriterPositionInstruction,
   parseTransferAdminInstruction,
+  parseTransferMarketDataAuthorityInstruction,
   parseUnwindWriterUnsoldInstruction,
   parseUpdateImpliedVolatilityInstruction,
   parseUpdateMarketDataInstruction,
@@ -290,6 +291,11 @@ export function parseOptionProgramInstruction<
         parseTransferAdminInstruction(instruction),
         instructionType,
       );
+    case OptionProgramInstruction.TransferMarketDataAuthority:
+      return withInstructionType(
+        parseTransferMarketDataAuthorityInstruction(instruction),
+        instructionType,
+      );
     case OptionProgramInstruction.UnwindWriterUnsold:
       return withInstructionType(
         parseUnwindWriterUnsoldInstruction(instruction),

package/short/builders.ts

@@ -21,6 +21,7 @@ import {
   deriveAssociatedTokenAddress,
   deriveMakerCollateralSharePda,
   deriveMetadataPda,
+  derivePoolLoanPdaFromWriterPosition,
   deriveVaultPda,
   deriveWriterPositionPda,
 } from "../accounts/pdas";
@@ -471,29 +472,32 @@ export async function buildOptionMintTransactionWithDerivation(
     params.programId
   );
 
-  // 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.
+  // Canonical loan is keyed by the writer position (`["pool_loan", writer_position]`),
+  // so it is stable across borrows. Derive it when the caller did not supply one.
+  const canonicalPoolLoan =
+    borrowedAmount > 0n
+      ? params.poolLoan ??
+        (await derivePoolLoanPdaFromWriterPosition(
+          writerPositionPdaForIx,
+          params.programId
+        ))[0]
+      : params.poolLoan;
+
+  // option_mint + borrow: `sync_collateral_pool_debt` must receive EVERY active loan
+  // for this writer position. The named `pool_loan` is the canonical loan; pass all
+  // OTHER active loans for the position as remaining accounts. This is normally empty,
+  // but during the canonical-loan migration a writer may still hold a legacy nonce-keyed
+  // loan alongside the canonical one — both must be present so the maintenance invariant
+  // (`snapshot.active_loan_count == writer.active_loan_count`) holds.
   let priorActivePoolLoans: RemainingAccountInput[] = [];
   if (borrowedAmount > 0n) {
     const wp = toAddress(writerPositionPdaForIx);
-    const newLoan = toAddress(params.poolLoan!);
-    const vaultPda = toAddress(params.vault!);
-    const [writerPos, activeLoans] = await Promise.all([
-      fetchWriterPosition(params.rpc, writerPositionPdaForIx),
-      fetchPoolLoansByMaker(params.rpc, params.maker, params.programId),
-    ]);
-    const newLoanAlreadyActive = activeLoans.some(
-      (loan) => toAddress(loan.address) === newLoan
-    );
-    const activeLoanCount = writerPos?.activeLoanCount ?? 0;
-    const priorCount = Math.max(
-      0,
-      activeLoanCount - (newLoanAlreadyActive ? 1 : 0)
+    const newLoan = toAddress(canonicalPoolLoan!);
+    const activeLoans = await fetchPoolLoansByMaker(
+      params.rpc,
+      params.maker,
+      params.programId
     );
-    const forWriter = (l: (typeof activeLoans)[0]) =>
-      toAddress(l.data.writerPosition) === wp && toAddress(l.address) !== newLoan;
     const sortByNonceDesc = (
       a: (typeof activeLoans)[0],
       b: (typeof activeLoans)[0]
@@ -502,16 +506,13 @@ export async function buildOptionMintTransactionWithDerivation(
       if (a.data.nonce < b.data.nonce) return 1;
       return String(a.address).localeCompare(String(b.address));
     };
-    const withVault = activeLoans
+    priorActivePoolLoans = activeLoans
       .filter(
-        (l) => forWriter(l) && toAddress(l.data.vault) === vaultPda
+        (l) =>
+          toAddress(l.data.writerPosition) === wp &&
+          toAddress(l.address) !== newLoan
       )
-      .sort(sortByNonceDesc);
-    const withoutVault = activeLoans.filter(forWriter).sort(sortByNonceDesc);
-    const candidates =
-      withVault.length >= priorCount ? withVault : withoutVault;
-    priorActivePoolLoans = candidates
-      .slice(0, priorCount)
+      .sort(sortByNonceDesc)
       .map((l) => ({ address: l.address, isWritable: true }));
   }
 
@@ -540,7 +541,7 @@ export async function buildOptionMintTransactionWithDerivation(
     escrowState: params.escrowState,
     escrowAuthority: params.escrowAuthority,
     escrowTokenAccount: params.escrowTokenAccount,
-    poolLoan: params.poolLoan,
+    poolLoan: canonicalPoolLoan,
     switchboardQueue: SWITCHBOARD_DEFAULT_DEVNET_QUEUE,
     remainingAccounts: [...priorActivePoolLoans, ...(params.remainingAccounts ?? [])],
   });

package/short/pool.ts

@@ -7,7 +7,7 @@ import {
 import type { Instruction } from "@solana/kit";
 import { toAddress } from "../client/program";
 import type { AddressLike, BuiltTransaction } from "../client/types";
-import { assertNonNegativeAmount, assertPositiveAmount } from "../shared/amounts";
+import { assertPositiveAmount } from "../shared/amounts";
 
 export interface BuildBorrowFromPoolParams {
   vault: AddressLike;
@@ -19,9 +19,9 @@ export interface BuildBorrowFromPoolParams {
   /** Writer position PDA: `["writer_position", optionPool, maker]`. */
   writerPosition: AddressLike;
   maker: AddressLike;
-  nonce: bigint | number;
   borrowAmount: bigint | number;
   collateralAmount: bigint | number;
+  /** Canonical loan PDA `["pool_loan", writerPosition]`; auto-derived when omitted. */
   poolLoan?: AddressLike;
   escrowState?: AddressLike;
   escrowAuthority?: AddressLike;
@@ -61,7 +61,6 @@ export interface BuildRepayPoolLoanFromCollateralParams {
 export async function buildBorrowFromPoolInstruction(
   params: BuildBorrowFromPoolParams
 ): Promise<Instruction<string>> {
-  assertNonNegativeAmount(params.nonce, "nonce");
   assertPositiveAmount(params.borrowAmount, "borrowAmount");
   assertPositiveAmount(params.collateralAmount, "collateralAmount");
 
@@ -78,7 +77,6 @@ export async function buildBorrowFromPoolInstruction(
     maker: toAddress(params.maker) as any,
     tokenProgram: params.tokenProgram ? toAddress(params.tokenProgram) : undefined,
     systemProgram: params.systemProgram ? toAddress(params.systemProgram) : undefined,
-    nonce: params.nonce,
     borrowAmount: params.borrowAmount,
     collateralAmount: params.collateralAmount,
   });