@epicentral/sos-sdk 0.13.1-beta → 0.14.0-beta

package/README.md

@@ -30,8 +30,9 @@ Additional modules:
 |----------|-------------|
 | `resolveOptionAccounts` | Resolves option pool, mints, vaults, and collateral accounts from option identity (underlying, type, strike, expiration). |
 | `deriveVaultPda` | Derives OMLP vault PDA from mint. |
-| `derivePoolLoanPdaFromVault` | Derives PoolLoan PDA from vault, maker, nonce (canonical; matches program). |
-| `derivePoolLoanPda` | *(Deprecated)* Legacy derivation; use `derivePoolLoanPdaFromVault`. |
+| `derivePoolLoanPdaFromWriterPosition` | Derives the canonical PoolLoan PDA `["pool_loan", writer_position]` (matches program). One accumulating loan per market position. |
+| `derivePoolLoanPdaFromVault` | *(Deprecated)* Legacy nonce-keyed derivation `["pool_loan", vault, maker, nonce]`; only for inspecting pre-migration loans. |
+| `derivePoolLoanPda` | *(Deprecated)* Legacy derivation; use `derivePoolLoanPdaFromWriterPosition`. |
 | `deriveWriterPositionPda` | Derives writer position PDA from option pool and writer. |
 | `deriveAssociatedTokenAddress` | Derives ATA for owner + mint. |
 | `fetchVault` | Fetches vault account by address. |

package/accounts/pdas.ts

@@ -287,8 +287,37 @@ export async function deriveEscrowAuthorityPda(
 }
 
 /**
- * Derives the PoolLoan PDA using the canonical seeds: vault, maker, nonce.
- * Matches the program's derivation in omlp_context.rs (BorrowFromPool).
+ * Derives the canonical PoolLoan PDA for a writer position.
+ *
+ * Matches the program's current derivation in omlp_context.rs (BorrowFromPool):
+ * `["pool_loan", writer_position]`. One canonical (accumulating) loan per market
+ * position, so the address is stable across borrows and only needs to be added to
+ * the program Address Lookup Table once.
+ *
+ * @param writerPosition - Writer position PDA (from deriveWriterPositionPda)
+ * @param programId - Optional program ID
+ */
+export async function derivePoolLoanPdaFromWriterPosition(
+  writerPosition: AddressLike,
+  programId: AddressLike = PROGRAM_ID
+): Promise<readonly [Address, number]> {
+  const addressEncoder = getAddressEncoder();
+  return getProgramDerivedAddress({
+    programAddress: toAddress(programId),
+    seeds: [
+      new TextEncoder().encode("pool_loan"),
+      addressEncoder.encode(toAddress(writerPosition)),
+    ],
+  });
+}
+
+/**
+ * Derives a legacy nonce-keyed PoolLoan PDA: `["pool_loan", vault, maker, nonce]`.
+ *
+ * @deprecated The program no longer creates loans with these seeds. Use
+ * {@link derivePoolLoanPdaFromWriterPosition}. Retained only to re-derive/inspect
+ * legacy loans created before the canonical-loan migration; legacy loans are still
+ * usable via address-based unwind/repay and drain naturally.
  *
  * @param vault - OMLP vault PDA (from deriveVaultPda)
  * @param maker - Writer/borrower pubkey

package/client/lookup-table.ts

@@ -4,7 +4,7 @@ import { PROGRAM_ID } from "./program";
 import type { KitRpc } from "./types";
 
 export const LOOKUP_TABLE_ADDRESSES: Record<"devnet" | "mainnet", Address | null> = {
-  devnet: address("9KB5MPdCHNNZ6MvjZv5JKqkzjyDMiFLcQonmQj3hAuee"),
+  devnet: address("9Vu3uV7gAG2EAeJLni43Qafay4bQxy2VFyMbUUNbpT3a"),
   mainnet: null,
 };
 

package/generated/instructions/borrowFromPool.ts

@@ -37,7 +37,6 @@ import {
 import { OPTION_PROGRAM_PROGRAM_ADDRESS } from "../programs";
 import {
   expectAddress,
-  expectSome,
   getAccountMetaFactory,
   type ResolvedAccount,
 } from "../shared";
@@ -54,7 +53,6 @@ export function getBorrowFromPoolDiscriminatorBytes() {
 
 export type BorrowFromPoolInstruction<
   TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
-  TAccountPoolLoan extends string | AccountMeta<string> = string,
   TAccountVault extends string | AccountMeta<string> = string,
   TAccountVaultTokenAccount extends string | AccountMeta<string> = string,
   TAccountEscrowState extends string | AccountMeta<string> = string,
@@ -63,6 +61,7 @@ export type BorrowFromPoolInstruction<
   TAccountCollateralMint extends string | AccountMeta<string> = string,
   TAccountOptionPool extends string | AccountMeta<string> = string,
   TAccountWriterPosition extends string | AccountMeta<string> = string,
+  TAccountPoolLoan extends string | AccountMeta<string> = string,
   TAccountMaker extends string | AccountMeta<string> = string,
   TAccountTokenProgram extends string | AccountMeta<string> =
     "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
@@ -73,9 +72,6 @@ export type BorrowFromPoolInstruction<
   InstructionWithData<ReadonlyUint8Array> &
   InstructionWithAccounts<
     [
-      TAccountPoolLoan extends string
-        ? WritableAccount<TAccountPoolLoan>
-        : TAccountPoolLoan,
       TAccountVault extends string
         ? WritableAccount<TAccountVault>
         : TAccountVault,
@@ -100,6 +96,9 @@ export type BorrowFromPoolInstruction<
       TAccountWriterPosition extends string
         ? ReadonlyAccount<TAccountWriterPosition>
         : TAccountWriterPosition,
+      TAccountPoolLoan extends string
+        ? WritableAccount<TAccountPoolLoan>
+        : TAccountPoolLoan,
       TAccountMaker extends string
         ? WritableSignerAccount<TAccountMaker> &
             AccountSignerMeta<TAccountMaker>
@@ -116,13 +115,11 @@ export type BorrowFromPoolInstruction<
 
 export type BorrowFromPoolInstructionData = {
   discriminator: ReadonlyUint8Array;
-  nonce: bigint;
   borrowAmount: bigint;
   collateralAmount: bigint;
 };
 
 export type BorrowFromPoolInstructionDataArgs = {
-  nonce: number | bigint;
   borrowAmount: number | bigint;
   collateralAmount: number | bigint;
 };
@@ -131,7 +128,6 @@ export function getBorrowFromPoolInstructionDataEncoder(): FixedSizeEncoder<Borr
   return transformEncoder(
     getStructEncoder([
       ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
-      ["nonce", getU64Encoder()],
       ["borrowAmount", getU64Encoder()],
       ["collateralAmount", getU64Encoder()],
     ]),
@@ -142,7 +138,6 @@ export function getBorrowFromPoolInstructionDataEncoder(): FixedSizeEncoder<Borr
 export function getBorrowFromPoolInstructionDataDecoder(): FixedSizeDecoder<BorrowFromPoolInstructionData> {
   return getStructDecoder([
     ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
-    ["nonce", getU64Decoder()],
     ["borrowAmount", getU64Decoder()],
     ["collateralAmount", getU64Decoder()],
   ]);
@@ -159,7 +154,6 @@ export function getBorrowFromPoolInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type BorrowFromPoolAsyncInput<
-  TAccountPoolLoan extends string = string,
   TAccountVault extends string = string,
   TAccountVaultTokenAccount extends string = string,
   TAccountEscrowState extends string = string,
@@ -168,12 +162,11 @@ export type BorrowFromPoolAsyncInput<
   TAccountCollateralMint extends string = string,
   TAccountOptionPool extends string = string,
   TAccountWriterPosition extends string = string,
+  TAccountPoolLoan extends string = string,
   TAccountMaker extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
 > = {
-  /** The pool loan account to track this borrow */
-  poolLoan?: Address<TAccountPoolLoan>;
   /** The vault to borrow from */
   vault: Address<TAccountVault>;
   /** Vault's token account (source of borrow) */
@@ -187,18 +180,25 @@ export type BorrowFromPoolAsyncInput<
   collateralMint: Address<TAccountCollateralMint>;
   /** May not be initialized yet when this runs in TX A before `option_mint` (TX B). */
   optionPool: Address<TAccountOptionPool>;
-  /** May be uninitialized until `option_mint`; the pubkey is stored on the loan. */
+  /**
+   * May be uninitialized until `option_mint`; the pubkey is stored on the loan and
+   * also seeds the canonical pool loan PDA below.
+   */
   writerPosition?: Address<TAccountWriterPosition>;
+  /**
+   * Canonical pool loan for this writer position. Declared after `writer_position`
+   * so its key is available for the seed. `init_if_needed` lets repeated borrows
+   * accumulate into one stable account (see struct docs).
+   */
+  poolLoan?: Address<TAccountPoolLoan>;
   maker: TransactionSigner<TAccountMaker>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
-  nonce: BorrowFromPoolInstructionDataArgs["nonce"];
   borrowAmount: BorrowFromPoolInstructionDataArgs["borrowAmount"];
   collateralAmount: BorrowFromPoolInstructionDataArgs["collateralAmount"];
 };
 
 export async function getBorrowFromPoolInstructionAsync<
-  TAccountPoolLoan extends string,
   TAccountVault extends string,
   TAccountVaultTokenAccount extends string,
   TAccountEscrowState extends string,
@@ -207,13 +207,13 @@ export async function getBorrowFromPoolInstructionAsync<
   TAccountCollateralMint extends string,
   TAccountOptionPool extends string,
   TAccountWriterPosition extends string,
+  TAccountPoolLoan extends string,
   TAccountMaker extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
   TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
 >(
   input: BorrowFromPoolAsyncInput<
-    TAccountPoolLoan,
     TAccountVault,
     TAccountVaultTokenAccount,
     TAccountEscrowState,
@@ -222,6 +222,7 @@ export async function getBorrowFromPoolInstructionAsync<
     TAccountCollateralMint,
     TAccountOptionPool,
     TAccountWriterPosition,
+    TAccountPoolLoan,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -230,7 +231,6 @@ export async function getBorrowFromPoolInstructionAsync<
 ): Promise<
   BorrowFromPoolInstruction<
     TProgramAddress,
-    TAccountPoolLoan,
     TAccountVault,
     TAccountVaultTokenAccount,
     TAccountEscrowState,
@@ -239,6 +239,7 @@ export async function getBorrowFromPoolInstructionAsync<
     TAccountCollateralMint,
     TAccountOptionPool,
     TAccountWriterPosition,
+    TAccountPoolLoan,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -250,7 +251,6 @@ export async function getBorrowFromPoolInstructionAsync<
 
   // Original accounts.
   const originalAccounts = {
-    poolLoan: { value: input.poolLoan ?? null, isWritable: true },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultTokenAccount: {
       value: input.vaultTokenAccount ?? null,
@@ -268,6 +268,7 @@ export async function getBorrowFromPoolInstructionAsync<
     collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     optionPool: { value: input.optionPool ?? null, isWritable: true },
     writerPosition: { value: input.writerPosition ?? null, isWritable: false },
+    poolLoan: { value: input.poolLoan ?? null, isWritable: true },
     maker: { value: input.maker ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
@@ -281,19 +282,6 @@ export async function getBorrowFromPoolInstructionAsync<
   const args = { ...input };
 
   // Resolve default values.
-  if (!accounts.poolLoan.value) {
-    accounts.poolLoan.value = await getProgramDerivedAddress({
-      programAddress,
-      seeds: [
-        getBytesEncoder().encode(
-          new Uint8Array([112, 111, 111, 108, 95, 108, 111, 97, 110]),
-        ),
-        getAddressEncoder().encode(expectAddress(accounts.vault.value)),
-        getAddressEncoder().encode(expectAddress(accounts.maker.value)),
-        getU64Encoder().encode(expectSome(args.nonce)),
-      ],
-    });
-  }
   if (!accounts.escrowState.value) {
     accounts.escrowState.value = await getProgramDerivedAddress({
       programAddress,
@@ -337,6 +325,19 @@ export async function getBorrowFromPoolInstructionAsync<
       ],
     });
   }
+  if (!accounts.poolLoan.value) {
+    accounts.poolLoan.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        getBytesEncoder().encode(
+          new Uint8Array([112, 111, 111, 108, 95, 108, 111, 97, 110]),
+        ),
+        getAddressEncoder().encode(
+          expectAddress(accounts.writerPosition.value),
+        ),
+      ],
+    });
+  }
   if (!accounts.tokenProgram.value) {
     accounts.tokenProgram.value =
       "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
@@ -349,7 +350,6 @@ export async function getBorrowFromPoolInstructionAsync<
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta(accounts.poolLoan),
       getAccountMeta(accounts.vault),
       getAccountMeta(accounts.vaultTokenAccount),
       getAccountMeta(accounts.escrowState),
@@ -358,6 +358,7 @@ export async function getBorrowFromPoolInstructionAsync<
       getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.poolLoan),
       getAccountMeta(accounts.maker),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
@@ -368,7 +369,6 @@ export async function getBorrowFromPoolInstructionAsync<
     programAddress,
   } as BorrowFromPoolInstruction<
     TProgramAddress,
-    TAccountPoolLoan,
     TAccountVault,
     TAccountVaultTokenAccount,
     TAccountEscrowState,
@@ -377,6 +377,7 @@ export async function getBorrowFromPoolInstructionAsync<
     TAccountCollateralMint,
     TAccountOptionPool,
     TAccountWriterPosition,
+    TAccountPoolLoan,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -384,7 +385,6 @@ export async function getBorrowFromPoolInstructionAsync<
 }
 
 export type BorrowFromPoolInput<
-  TAccountPoolLoan extends string = string,
   TAccountVault extends string = string,
   TAccountVaultTokenAccount extends string = string,
   TAccountEscrowState extends string = string,
@@ -393,12 +393,11 @@ export type BorrowFromPoolInput<
   TAccountCollateralMint extends string = string,
   TAccountOptionPool extends string = string,
   TAccountWriterPosition extends string = string,
+  TAccountPoolLoan extends string = string,
   TAccountMaker extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountSystemProgram extends string = string,
 > = {
-  /** The pool loan account to track this borrow */
-  poolLoan: Address<TAccountPoolLoan>;
   /** The vault to borrow from */
   vault: Address<TAccountVault>;
   /** Vault's token account (source of borrow) */
@@ -412,18 +411,25 @@ export type BorrowFromPoolInput<
   collateralMint: Address<TAccountCollateralMint>;
   /** May not be initialized yet when this runs in TX A before `option_mint` (TX B). */
   optionPool: Address<TAccountOptionPool>;
-  /** May be uninitialized until `option_mint`; the pubkey is stored on the loan. */
+  /**
+   * May be uninitialized until `option_mint`; the pubkey is stored on the loan and
+   * also seeds the canonical pool loan PDA below.
+   */
   writerPosition: Address<TAccountWriterPosition>;
+  /**
+   * Canonical pool loan for this writer position. Declared after `writer_position`
+   * so its key is available for the seed. `init_if_needed` lets repeated borrows
+   * accumulate into one stable account (see struct docs).
+   */
+  poolLoan: Address<TAccountPoolLoan>;
   maker: TransactionSigner<TAccountMaker>;
   tokenProgram?: Address<TAccountTokenProgram>;
   systemProgram?: Address<TAccountSystemProgram>;
-  nonce: BorrowFromPoolInstructionDataArgs["nonce"];
   borrowAmount: BorrowFromPoolInstructionDataArgs["borrowAmount"];
   collateralAmount: BorrowFromPoolInstructionDataArgs["collateralAmount"];
 };
 
 export function getBorrowFromPoolInstruction<
-  TAccountPoolLoan extends string,
   TAccountVault extends string,
   TAccountVaultTokenAccount extends string,
   TAccountEscrowState extends string,
@@ -432,13 +438,13 @@ export function getBorrowFromPoolInstruction<
   TAccountCollateralMint extends string,
   TAccountOptionPool extends string,
   TAccountWriterPosition extends string,
+  TAccountPoolLoan extends string,
   TAccountMaker extends string,
   TAccountTokenProgram extends string,
   TAccountSystemProgram extends string,
   TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
 >(
   input: BorrowFromPoolInput<
-    TAccountPoolLoan,
     TAccountVault,
     TAccountVaultTokenAccount,
     TAccountEscrowState,
@@ -447,6 +453,7 @@ export function getBorrowFromPoolInstruction<
     TAccountCollateralMint,
     TAccountOptionPool,
     TAccountWriterPosition,
+    TAccountPoolLoan,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -454,7 +461,6 @@ export function getBorrowFromPoolInstruction<
   config?: { programAddress?: TProgramAddress },
 ): BorrowFromPoolInstruction<
   TProgramAddress,
-  TAccountPoolLoan,
   TAccountVault,
   TAccountVaultTokenAccount,
   TAccountEscrowState,
@@ -463,6 +469,7 @@ export function getBorrowFromPoolInstruction<
   TAccountCollateralMint,
   TAccountOptionPool,
   TAccountWriterPosition,
+  TAccountPoolLoan,
   TAccountMaker,
   TAccountTokenProgram,
   TAccountSystemProgram
@@ -473,7 +480,6 @@ export function getBorrowFromPoolInstruction<
 
   // Original accounts.
   const originalAccounts = {
-    poolLoan: { value: input.poolLoan ?? null, isWritable: true },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultTokenAccount: {
       value: input.vaultTokenAccount ?? null,
@@ -491,6 +497,7 @@ export function getBorrowFromPoolInstruction<
     collateralMint: { value: input.collateralMint ?? null, isWritable: false },
     optionPool: { value: input.optionPool ?? null, isWritable: true },
     writerPosition: { value: input.writerPosition ?? null, isWritable: false },
+    poolLoan: { value: input.poolLoan ?? null, isWritable: true },
     maker: { value: input.maker ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
@@ -516,7 +523,6 @@ export function getBorrowFromPoolInstruction<
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
-      getAccountMeta(accounts.poolLoan),
       getAccountMeta(accounts.vault),
       getAccountMeta(accounts.vaultTokenAccount),
       getAccountMeta(accounts.escrowState),
@@ -525,6 +531,7 @@ export function getBorrowFromPoolInstruction<
       getAccountMeta(accounts.collateralMint),
       getAccountMeta(accounts.optionPool),
       getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.poolLoan),
       getAccountMeta(accounts.maker),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.systemProgram),
@@ -535,7 +542,6 @@ export function getBorrowFromPoolInstruction<
     programAddress,
   } as BorrowFromPoolInstruction<
     TProgramAddress,
-    TAccountPoolLoan,
     TAccountVault,
     TAccountVaultTokenAccount,
     TAccountEscrowState,
@@ -544,6 +550,7 @@ export function getBorrowFromPoolInstruction<
     TAccountCollateralMint,
     TAccountOptionPool,
     TAccountWriterPosition,
+    TAccountPoolLoan,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountSystemProgram
@@ -556,23 +563,30 @@ export type ParsedBorrowFromPoolInstruction<
 > = {
   programAddress: Address<TProgram>;
   accounts: {
-    /** The pool loan account to track this borrow */
-    poolLoan: TAccountMetas[0];
     /** The vault to borrow from */
-    vault: TAccountMetas[1];
+    vault: TAccountMetas[0];
     /** Vault's token account (source of borrow) */
-    vaultTokenAccount: TAccountMetas[2];
+    vaultTokenAccount: TAccountMetas[1];
     /** Escrow state PDA - validates maker/mint binding */
-    escrowState: TAccountMetas[3];
-    escrowAuthority: TAccountMetas[4];
+    escrowState: TAccountMetas[2];
+    escrowAuthority: TAccountMetas[3];
     /** Escrow token account (destination for borrowed funds) */
-    escrowTokenAccount: TAccountMetas[5];
+    escrowTokenAccount: TAccountMetas[4];
     /** Collateral mint (e.g., WSOL) - for validation */
-    collateralMint: TAccountMetas[6];
+    collateralMint: TAccountMetas[5];
     /** May not be initialized yet when this runs in TX A before `option_mint` (TX B). */
-    optionPool: TAccountMetas[7];
-    /** May be uninitialized until `option_mint`; the pubkey is stored on the loan. */
-    writerPosition: TAccountMetas[8];
+    optionPool: TAccountMetas[6];
+    /**
+     * May be uninitialized until `option_mint`; the pubkey is stored on the loan and
+     * also seeds the canonical pool loan PDA below.
+     */
+    writerPosition: TAccountMetas[7];
+    /**
+     * Canonical pool loan for this writer position. Declared after `writer_position`
+     * so its key is available for the seed. `init_if_needed` lets repeated borrows
+     * accumulate into one stable account (see struct docs).
+     */
+    poolLoan: TAccountMetas[8];
     maker: TAccountMetas[9];
     tokenProgram: TAccountMetas[10];
     systemProgram: TAccountMetas[11];
@@ -601,7 +615,6 @@ export function parseBorrowFromPoolInstruction<
   return {
     programAddress: instruction.programAddress,
     accounts: {
-      poolLoan: getNextAccount(),
       vault: getNextAccount(),
       vaultTokenAccount: getNextAccount(),
       escrowState: getNextAccount(),
@@ -610,6 +623,7 @@ export function parseBorrowFromPoolInstruction<
       collateralMint: getNextAccount(),
       optionPool: getNextAccount(),
       writerPosition: getNextAccount(),
+      poolLoan: getNextAccount(),
       maker: getNextAccount(),
       tokenProgram: getNextAccount(),
       systemProgram: getNextAccount(),

package/generated/instructions/index.ts

@@ -47,6 +47,7 @@ export * from "./repayPoolLoanFromWallet";
 export * from "./settleMakerCollateral";
 export * from "./syncWriterPosition";
 export * from "./transferAdmin";
+export * from "./transferMarketDataAuthority";
 export * from "./unwindWriterUnsold";
 export * from "./updateImpliedVolatility";
 export * from "./updateMarketData";

package/generated/instructions/transferMarketDataAuthority.ts

@@ -0,0 +1,313 @@
+/**
+ * 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,
+  fixDecoderSize,
+  fixEncoderSize,
+  getAddressDecoder,
+  getAddressEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
+  getProgramDerivedAddress,
+  getStructDecoder,
+  getStructEncoder,
+  transformEncoder,
+  type AccountMeta,
+  type AccountSignerMeta,
+  type Address,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlySignerAccount,
+  type ReadonlyUint8Array,
+  type TransactionSigner,
+  type WritableAccount,
+} from "@solana/kit";
+import { OPTION_PROGRAM_PROGRAM_ADDRESS } from "../programs";
+import {
+  expectAddress,
+  getAccountMetaFactory,
+  type ResolvedAccount,
+} from "../shared";
+
+export const TRANSFER_MARKET_DATA_AUTHORITY_DISCRIMINATOR = new Uint8Array([
+  81, 39, 144, 5, 135, 201, 220, 167,
+]);
+
+export function getTransferMarketDataAuthorityDiscriminatorBytes() {
+  return fixEncoderSize(getBytesEncoder(), 8).encode(
+    TRANSFER_MARKET_DATA_AUTHORITY_DISCRIMINATOR,
+  );
+}
+
+export type TransferMarketDataAuthorityInstruction<
+  TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+  TAccountMarketData extends string | AccountMeta<string> = string,
+  TAccountUnderlyingAsset extends string | AccountMeta<string> = string,
+  TAccountAuthority extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
+    [
+      TAccountMarketData extends string
+        ? WritableAccount<TAccountMarketData>
+        : TAccountMarketData,
+      TAccountUnderlyingAsset extends string
+        ? ReadonlyAccount<TAccountUnderlyingAsset>
+        : TAccountUnderlyingAsset,
+      TAccountAuthority extends string
+        ? ReadonlySignerAccount<TAccountAuthority> &
+            AccountSignerMeta<TAccountAuthority>
+        : TAccountAuthority,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type TransferMarketDataAuthorityInstructionData = {
+  discriminator: ReadonlyUint8Array;
+  newAuthority: Address;
+};
+
+export type TransferMarketDataAuthorityInstructionDataArgs = {
+  newAuthority: Address;
+};
+
+export function getTransferMarketDataAuthorityInstructionDataEncoder(): FixedSizeEncoder<TransferMarketDataAuthorityInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([
+      ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
+      ["newAuthority", getAddressEncoder()],
+    ]),
+    (value) => ({
+      ...value,
+      discriminator: TRANSFER_MARKET_DATA_AUTHORITY_DISCRIMINATOR,
+    }),
+  );
+}
+
+export function getTransferMarketDataAuthorityInstructionDataDecoder(): FixedSizeDecoder<TransferMarketDataAuthorityInstructionData> {
+  return getStructDecoder([
+    ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
+    ["newAuthority", getAddressDecoder()],
+  ]);
+}
+
+export function getTransferMarketDataAuthorityInstructionDataCodec(): FixedSizeCodec<
+  TransferMarketDataAuthorityInstructionDataArgs,
+  TransferMarketDataAuthorityInstructionData
+> {
+  return combineCodec(
+    getTransferMarketDataAuthorityInstructionDataEncoder(),
+    getTransferMarketDataAuthorityInstructionDataDecoder(),
+  );
+}
+
+export type TransferMarketDataAuthorityAsyncInput<
+  TAccountMarketData extends string = string,
+  TAccountUnderlyingAsset extends string = string,
+  TAccountAuthority extends string = string,
+> = {
+  marketData?: Address<TAccountMarketData>;
+  underlyingAsset: Address<TAccountUnderlyingAsset>;
+  authority: TransactionSigner<TAccountAuthority>;
+  newAuthority: TransferMarketDataAuthorityInstructionDataArgs["newAuthority"];
+};
+
+export async function getTransferMarketDataAuthorityInstructionAsync<
+  TAccountMarketData extends string,
+  TAccountUnderlyingAsset extends string,
+  TAccountAuthority extends string,
+  TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+>(
+  input: TransferMarketDataAuthorityAsyncInput<
+    TAccountMarketData,
+    TAccountUnderlyingAsset,
+    TAccountAuthority
+  >,
+  config?: { programAddress?: TProgramAddress },
+): Promise<
+  TransferMarketDataAuthorityInstruction<
+    TProgramAddress,
+    TAccountMarketData,
+    TAccountUnderlyingAsset,
+    TAccountAuthority
+  >
+> {
+  // Program address.
+  const programAddress =
+    config?.programAddress ?? OPTION_PROGRAM_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    marketData: { value: input.marketData ?? null, isWritable: true },
+    underlyingAsset: {
+      value: input.underlyingAsset ?? null,
+      isWritable: false,
+    },
+    authority: { value: input.authority ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  // Original args.
+  const args = { ...input };
+
+  // Resolve default values.
+  if (!accounts.marketData.value) {
+    accounts.marketData.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        getBytesEncoder().encode(
+          new Uint8Array([109, 97, 114, 107, 101, 116, 95, 100, 97, 116, 97]),
+        ),
+        getAddressEncoder().encode(
+          expectAddress(accounts.underlyingAsset.value),
+        ),
+      ],
+    });
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta(accounts.marketData),
+      getAccountMeta(accounts.underlyingAsset),
+      getAccountMeta(accounts.authority),
+    ],
+    data: getTransferMarketDataAuthorityInstructionDataEncoder().encode(
+      args as TransferMarketDataAuthorityInstructionDataArgs,
+    ),
+    programAddress,
+  } as TransferMarketDataAuthorityInstruction<
+    TProgramAddress,
+    TAccountMarketData,
+    TAccountUnderlyingAsset,
+    TAccountAuthority
+  >);
+}
+
+export type TransferMarketDataAuthorityInput<
+  TAccountMarketData extends string = string,
+  TAccountUnderlyingAsset extends string = string,
+  TAccountAuthority extends string = string,
+> = {
+  marketData: Address<TAccountMarketData>;
+  underlyingAsset: Address<TAccountUnderlyingAsset>;
+  authority: TransactionSigner<TAccountAuthority>;
+  newAuthority: TransferMarketDataAuthorityInstructionDataArgs["newAuthority"];
+};
+
+export function getTransferMarketDataAuthorityInstruction<
+  TAccountMarketData extends string,
+  TAccountUnderlyingAsset extends string,
+  TAccountAuthority extends string,
+  TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+>(
+  input: TransferMarketDataAuthorityInput<
+    TAccountMarketData,
+    TAccountUnderlyingAsset,
+    TAccountAuthority
+  >,
+  config?: { programAddress?: TProgramAddress },
+): TransferMarketDataAuthorityInstruction<
+  TProgramAddress,
+  TAccountMarketData,
+  TAccountUnderlyingAsset,
+  TAccountAuthority
+> {
+  // Program address.
+  const programAddress =
+    config?.programAddress ?? OPTION_PROGRAM_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    marketData: { value: input.marketData ?? null, isWritable: true },
+    underlyingAsset: {
+      value: input.underlyingAsset ?? null,
+      isWritable: false,
+    },
+    authority: { value: input.authority ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  // Original args.
+  const args = { ...input };
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta(accounts.marketData),
+      getAccountMeta(accounts.underlyingAsset),
+      getAccountMeta(accounts.authority),
+    ],
+    data: getTransferMarketDataAuthorityInstructionDataEncoder().encode(
+      args as TransferMarketDataAuthorityInstructionDataArgs,
+    ),
+    programAddress,
+  } as TransferMarketDataAuthorityInstruction<
+    TProgramAddress,
+    TAccountMarketData,
+    TAccountUnderlyingAsset,
+    TAccountAuthority
+  >);
+}
+
+export type ParsedTransferMarketDataAuthorityInstruction<
+  TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    marketData: TAccountMetas[0];
+    underlyingAsset: TAccountMetas[1];
+    authority: TAccountMetas[2];
+  };
+  data: TransferMarketDataAuthorityInstructionData;
+};
+
+export function parseTransferMarketDataAuthorityInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>,
+): ParsedTransferMarketDataAuthorityInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 3) {
+    // TODO: Coded error.
+    throw new Error("Not enough accounts");
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      marketData: getNextAccount(),
+      underlyingAsset: getNextAccount(),
+      authority: getNextAccount(),
+    },
+    data: getTransferMarketDataAuthorityInstructionDataDecoder().decode(
+      instruction.data,
+    ),
+  };
+}

package/generated/programs/optionProgram.ts

@@ -55,6 +55,7 @@ import {
   type ParsedSettleMakerCollateralInstruction,
   type ParsedSyncWriterPositionInstruction,
   type ParsedTransferAdminInstruction,
+  type ParsedTransferMarketDataAuthorityInstruction,
   type ParsedUnwindWriterUnsoldInstruction,
   type ParsedUpdateImpliedVolatilityInstruction,
   type ParsedUpdateMarketDataInstruction,
@@ -287,6 +288,7 @@ export enum OptionProgramInstruction {
   SettleMakerCollateral,
   SyncWriterPosition,
   TransferAdmin,
+  TransferMarketDataAuthority,
   UnwindWriterUnsold,
   UpdateImpliedVolatility,
   UpdateMarketData,
@@ -749,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,
@@ -935,6 +948,9 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.TransferAdmin;
     } & ParsedTransferAdminInstruction<TProgram>)
+  | ({
+      instructionType: OptionProgramInstruction.TransferMarketDataAuthority;
+    } & ParsedTransferMarketDataAuthorityInstruction<TProgram>)
   | ({
       instructionType: OptionProgramInstruction.UnwindWriterUnsold;
     } & ParsedUnwindWriterUnsoldInstruction<TProgram>)

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.1-beta",
+  "version": "0.14.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/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,
   });