@epicentral/sos-sdk 0.2.1 → 0.2.3

package/generated/accounts/index.ts

@@ -8,10 +8,8 @@
 
 export * from "./collateralPool";
 export * from "./config";
-export * from "./dualSourceContract";
 export * from "./escrowState";
 export * from "./lenderPosition";
-export * from "./liquidityRouter";
 export * from "./makerCollateralShare";
 export * from "./marketDataAccount";
 export * from "./optionAccount";

package/generated/instructions/index.ts

@@ -15,7 +15,6 @@ export * from "./claimTheta";
 export * from "./closeLongToPool";
 export * from "./closeOption";
 export * from "./createEscrowV2";
-export * from "./createLiquidityRouter";
 export * from "./depositCollateral";
 export * from "./depositToPosition";
 export * from "./initCollateralPool";
@@ -24,7 +23,6 @@ export * from "./initializeMarketData";
 export * from "./initOptionPool";
 export * from "./liquidateWriterPosition";
 export * from "./omlpCreateVault";
-export * from "./omlpTakeOfferWithFailover";
 export * from "./omlpUpdateMaxLeverage";
 export * from "./omlpUpdateProtocolFee";
 export * from "./omlpUpdateSupplyLimit";

package/generated/instructions/optionMint.ts

@@ -92,7 +92,6 @@ export type OptionMintInstruction<
   TAccountEscrowAuthority extends string | AccountMeta<string> = string,
   TAccountEscrowTokenAccount extends string | AccountMeta<string> = string,
   TAccountPoolLoan extends string | AccountMeta<string> = string,
-  TAccountLiquidityRouter extends string | AccountMeta<string> = string,
   TAccountMaker extends string | AccountMeta<string> = string,
   TAccountTokenProgram extends string | AccountMeta<string> =
     "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
@@ -178,9 +177,6 @@ export type OptionMintInstruction<
       TAccountPoolLoan extends string
         ? WritableAccount<TAccountPoolLoan>
         : TAccountPoolLoan,
-      TAccountLiquidityRouter extends string
-        ? WritableAccount<TAccountLiquidityRouter>
-        : TAccountLiquidityRouter,
       TAccountMaker extends string
         ? WritableSignerAccount<TAccountMaker> &
             AccountSignerMeta<TAccountMaker>
@@ -298,7 +294,6 @@ export type OptionMintAsyncInput<
   TAccountEscrowAuthority extends string = string,
   TAccountEscrowTokenAccount extends string = string,
   TAccountPoolLoan extends string = string,
-  TAccountLiquidityRouter extends string = string,
   TAccountMaker extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountAssociatedTokenProgram extends string = string,
@@ -358,8 +353,6 @@ export type OptionMintAsyncInput<
   escrowTokenAccount?: Address<TAccountEscrowTokenAccount>;
   /** Pool loan account (optional - only required if borrowing) */
   poolLoan?: Address<TAccountPoolLoan>;
-  /** Liquidity router (optional - only required if borrowing with SAP1/SAP2 failover) */
-  liquidityRouter?: Address<TAccountLiquidityRouter>;
   maker: TransactionSigner<TAccountMaker>;
   tokenProgram?: Address<TAccountTokenProgram>;
   associatedTokenProgram?: Address<TAccountAssociatedTokenProgram>;
@@ -400,7 +393,6 @@ export async function getOptionMintInstructionAsync<
   TAccountEscrowAuthority extends string,
   TAccountEscrowTokenAccount extends string,
   TAccountPoolLoan extends string,
-  TAccountLiquidityRouter extends string,
   TAccountMaker extends string,
   TAccountTokenProgram extends string,
   TAccountAssociatedTokenProgram extends string,
@@ -433,7 +425,6 @@ export async function getOptionMintInstructionAsync<
     TAccountEscrowAuthority,
     TAccountEscrowTokenAccount,
     TAccountPoolLoan,
-    TAccountLiquidityRouter,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountAssociatedTokenProgram,
@@ -468,7 +459,6 @@ export async function getOptionMintInstructionAsync<
     TAccountEscrowAuthority,
     TAccountEscrowTokenAccount,
     TAccountPoolLoan,
-    TAccountLiquidityRouter,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountAssociatedTokenProgram,
@@ -533,7 +523,6 @@ export async function getOptionMintInstructionAsync<
       isWritable: true,
     },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
-    liquidityRouter: { value: input.liquidityRouter ?? null, isWritable: true },
     maker: { value: input.maker ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     associatedTokenProgram: {
@@ -795,7 +784,6 @@ export async function getOptionMintInstructionAsync<
       getAccountMeta(accounts.escrowAuthority),
       getAccountMeta(accounts.escrowTokenAccount),
       getAccountMeta(accounts.poolLoan),
-      getAccountMeta(accounts.liquidityRouter),
       getAccountMeta(accounts.maker),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.associatedTokenProgram),
@@ -832,7 +820,6 @@ export async function getOptionMintInstructionAsync<
     TAccountEscrowAuthority,
     TAccountEscrowTokenAccount,
     TAccountPoolLoan,
-    TAccountLiquidityRouter,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountAssociatedTokenProgram,
@@ -866,7 +853,6 @@ export type OptionMintInput<
   TAccountEscrowAuthority extends string = string,
   TAccountEscrowTokenAccount extends string = string,
   TAccountPoolLoan extends string = string,
-  TAccountLiquidityRouter extends string = string,
   TAccountMaker extends string = string,
   TAccountTokenProgram extends string = string,
   TAccountAssociatedTokenProgram extends string = string,
@@ -926,8 +912,6 @@ export type OptionMintInput<
   escrowTokenAccount?: Address<TAccountEscrowTokenAccount>;
   /** Pool loan account (optional - only required if borrowing) */
   poolLoan?: Address<TAccountPoolLoan>;
-  /** Liquidity router (optional - only required if borrowing with SAP1/SAP2 failover) */
-  liquidityRouter?: Address<TAccountLiquidityRouter>;
   maker: TransactionSigner<TAccountMaker>;
   tokenProgram?: Address<TAccountTokenProgram>;
   associatedTokenProgram?: Address<TAccountAssociatedTokenProgram>;
@@ -968,7 +952,6 @@ export function getOptionMintInstruction<
   TAccountEscrowAuthority extends string,
   TAccountEscrowTokenAccount extends string,
   TAccountPoolLoan extends string,
-  TAccountLiquidityRouter extends string,
   TAccountMaker extends string,
   TAccountTokenProgram extends string,
   TAccountAssociatedTokenProgram extends string,
@@ -1001,7 +984,6 @@ export function getOptionMintInstruction<
     TAccountEscrowAuthority,
     TAccountEscrowTokenAccount,
     TAccountPoolLoan,
-    TAccountLiquidityRouter,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountAssociatedTokenProgram,
@@ -1035,7 +1017,6 @@ export function getOptionMintInstruction<
   TAccountEscrowAuthority,
   TAccountEscrowTokenAccount,
   TAccountPoolLoan,
-  TAccountLiquidityRouter,
   TAccountMaker,
   TAccountTokenProgram,
   TAccountAssociatedTokenProgram,
@@ -1099,7 +1080,6 @@ export function getOptionMintInstruction<
       isWritable: true,
     },
     poolLoan: { value: input.poolLoan ?? null, isWritable: true },
-    liquidityRouter: { value: input.liquidityRouter ?? null, isWritable: true },
     maker: { value: input.maker ?? null, isWritable: true },
     tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
     associatedTokenProgram: {
@@ -1169,7 +1149,6 @@ export function getOptionMintInstruction<
       getAccountMeta(accounts.escrowAuthority),
       getAccountMeta(accounts.escrowTokenAccount),
       getAccountMeta(accounts.poolLoan),
-      getAccountMeta(accounts.liquidityRouter),
       getAccountMeta(accounts.maker),
       getAccountMeta(accounts.tokenProgram),
       getAccountMeta(accounts.associatedTokenProgram),
@@ -1206,7 +1185,6 @@ export function getOptionMintInstruction<
     TAccountEscrowAuthority,
     TAccountEscrowTokenAccount,
     TAccountPoolLoan,
-    TAccountLiquidityRouter,
     TAccountMaker,
     TAccountTokenProgram,
     TAccountAssociatedTokenProgram,
@@ -1274,14 +1252,12 @@ export type ParsedOptionMintInstruction<
     escrowTokenAccount?: TAccountMetas[21] | undefined;
     /** Pool loan account (optional - only required if borrowing) */
     poolLoan?: TAccountMetas[22] | undefined;
-    /** Liquidity router (optional - only required if borrowing with SAP1/SAP2 failover) */
-    liquidityRouter?: TAccountMetas[23] | undefined;
-    maker: TAccountMetas[24];
-    tokenProgram: TAccountMetas[25];
-    associatedTokenProgram: TAccountMetas[26];
-    tokenMetadataProgram: TAccountMetas[27];
-    systemProgram: TAccountMetas[28];
-    rent: TAccountMetas[29];
+    maker: TAccountMetas[23];
+    tokenProgram: TAccountMetas[24];
+    associatedTokenProgram: TAccountMetas[25];
+    tokenMetadataProgram: TAccountMetas[26];
+    systemProgram: TAccountMetas[27];
+    rent: TAccountMetas[28];
   };
   data: OptionMintInstructionData;
 };
@@ -1294,7 +1270,7 @@ export function parseOptionMintInstruction<
     InstructionWithAccounts<TAccountMetas> &
     InstructionWithData<ReadonlyUint8Array>,
 ): ParsedOptionMintInstruction<TProgram, TAccountMetas> {
-  if (instruction.accounts.length < 30) {
+  if (instruction.accounts.length < 29) {
     // TODO: Coded error.
     throw new Error("Not enough accounts");
   }
@@ -1336,7 +1312,6 @@ export function parseOptionMintInstruction<
       escrowAuthority: getNextOptionalAccount(),
       escrowTokenAccount: getNextOptionalAccount(),
       poolLoan: getNextOptionalAccount(),
-      liquidityRouter: getNextOptionalAccount(),
       maker: getNextAccount(),
       tokenProgram: getNextAccount(),
       associatedTokenProgram: getNextAccount(),

package/generated/programs/optionProgram.ts

@@ -26,7 +26,6 @@ import {
   parseCloseLongToPoolInstruction,
   parseCloseOptionInstruction,
   parseCreateEscrowV2Instruction,
-  parseCreateLiquidityRouterInstruction,
   parseDepositCollateralInstruction,
   parseDepositToPositionInstruction,
   parseInitCollateralPoolInstruction,
@@ -35,7 +34,6 @@ import {
   parseInitOptionPoolInstruction,
   parseLiquidateWriterPositionInstruction,
   parseOmlpCreateVaultInstruction,
-  parseOmlpTakeOfferWithFailoverInstruction,
   parseOmlpUpdateMaxLeverageInstruction,
   parseOmlpUpdateProtocolFeeInstruction,
   parseOmlpUpdateSupplyLimitInstruction,
@@ -61,7 +59,6 @@ import {
   type ParsedCloseLongToPoolInstruction,
   type ParsedCloseOptionInstruction,
   type ParsedCreateEscrowV2Instruction,
-  type ParsedCreateLiquidityRouterInstruction,
   type ParsedDepositCollateralInstruction,
   type ParsedDepositToPositionInstruction,
   type ParsedInitCollateralPoolInstruction,
@@ -70,7 +67,6 @@ import {
   type ParsedInitOptionPoolInstruction,
   type ParsedLiquidateWriterPositionInstruction,
   type ParsedOmlpCreateVaultInstruction,
-  type ParsedOmlpTakeOfferWithFailoverInstruction,
   type ParsedOmlpUpdateMaxLeverageInstruction,
   type ParsedOmlpUpdateProtocolFeeInstruction,
   type ParsedOmlpUpdateSupplyLimitInstruction,
@@ -95,10 +91,8 @@ export const OPTION_PROGRAM_PROGRAM_ADDRESS =
 export enum OptionProgramAccount {
   CollateralPool,
   Config,
-  DualSourceContract,
   EscrowState,
   LenderPosition,
-  LiquidityRouter,
   MakerCollateralShare,
   MarketDataAccount,
   OptionAccount,
@@ -136,17 +130,6 @@ export function identifyOptionProgramAccount(
   ) {
     return OptionProgramAccount.Config;
   }
-  if (
-    containsBytes(
-      data,
-      fixEncoderSize(getBytesEncoder(), 8).encode(
-        new Uint8Array([114, 105, 97, 181, 162, 170, 126, 215]),
-      ),
-      0,
-    )
-  ) {
-    return OptionProgramAccount.DualSourceContract;
-  }
   if (
     containsBytes(
       data,
@@ -169,17 +152,6 @@ export function identifyOptionProgramAccount(
   ) {
     return OptionProgramAccount.LenderPosition;
   }
-  if (
-    containsBytes(
-      data,
-      fixEncoderSize(getBytesEncoder(), 8).encode(
-        new Uint8Array([151, 96, 76, 12, 200, 0, 147, 111]),
-      ),
-      0,
-    )
-  ) {
-    return OptionProgramAccount.LiquidityRouter;
-  }
   if (
     containsBytes(
       data,
@@ -294,7 +266,6 @@ export enum OptionProgramInstruction {
   CloseLongToPool,
   CloseOption,
   CreateEscrowV2,
-  CreateLiquidityRouter,
   DepositCollateral,
   DepositToPosition,
   InitCollateralPool,
@@ -303,7 +274,6 @@ export enum OptionProgramInstruction {
   InitializeMarketData,
   LiquidateWriterPosition,
   OmlpCreateVault,
-  OmlpTakeOfferWithFailover,
   OmlpUpdateMaxLeverage,
   OmlpUpdateProtocolFee,
   OmlpUpdateSupplyLimit,
@@ -425,17 +395,6 @@ export function identifyOptionProgramInstruction(
   ) {
     return OptionProgramInstruction.CreateEscrowV2;
   }
-  if (
-    containsBytes(
-      data,
-      fixEncoderSize(getBytesEncoder(), 8).encode(
-        new Uint8Array([226, 122, 201, 80, 25, 49, 83, 84]),
-      ),
-      0,
-    )
-  ) {
-    return OptionProgramInstruction.CreateLiquidityRouter;
-  }
   if (
     containsBytes(
       data,
@@ -524,17 +483,6 @@ export function identifyOptionProgramInstruction(
   ) {
     return OptionProgramInstruction.OmlpCreateVault;
   }
-  if (
-    containsBytes(
-      data,
-      fixEncoderSize(getBytesEncoder(), 8).encode(
-        new Uint8Array([39, 155, 118, 226, 84, 159, 5, 76]),
-      ),
-      0,
-    )
-  ) {
-    return OptionProgramInstruction.OmlpTakeOfferWithFailover;
-  }
   if (
     containsBytes(
       data,
@@ -746,9 +694,6 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.CreateEscrowV2;
     } & ParsedCreateEscrowV2Instruction<TProgram>)
-  | ({
-      instructionType: OptionProgramInstruction.CreateLiquidityRouter;
-    } & ParsedCreateLiquidityRouterInstruction<TProgram>)
   | ({
       instructionType: OptionProgramInstruction.DepositCollateral;
     } & ParsedDepositCollateralInstruction<TProgram>)
@@ -773,9 +718,6 @@ export type ParsedOptionProgramInstruction<
   | ({
       instructionType: OptionProgramInstruction.OmlpCreateVault;
     } & ParsedOmlpCreateVaultInstruction<TProgram>)
-  | ({
-      instructionType: OptionProgramInstruction.OmlpTakeOfferWithFailover;
-    } & ParsedOmlpTakeOfferWithFailoverInstruction<TProgram>)
   | ({
       instructionType: OptionProgramInstruction.OmlpUpdateMaxLeverage;
     } & ParsedOmlpUpdateMaxLeverageInstruction<TProgram>)
@@ -893,13 +835,6 @@ export function parseOptionProgramInstruction<TProgram extends string>(
         ...parseCreateEscrowV2Instruction(instruction),
       };
     }
-    case OptionProgramInstruction.CreateLiquidityRouter: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.CreateLiquidityRouter,
-        ...parseCreateLiquidityRouterInstruction(instruction),
-      };
-    }
     case OptionProgramInstruction.DepositCollateral: {
       assertIsInstructionWithAccounts(instruction);
       return {
@@ -956,13 +891,6 @@ export function parseOptionProgramInstruction<TProgram extends string>(
         ...parseOmlpCreateVaultInstruction(instruction),
       };
     }
-    case OptionProgramInstruction.OmlpTakeOfferWithFailover: {
-      assertIsInstructionWithAccounts(instruction);
-      return {
-        instructionType: OptionProgramInstruction.OmlpTakeOfferWithFailover,
-        ...parseOmlpTakeOfferWithFailoverInstruction(instruction),
-      };
-    }
     case OptionProgramInstruction.OmlpUpdateMaxLeverage: {
       assertIsInstructionWithAccounts(instruction);
       return {

package/generated/types/index.ts

@@ -6,13 +6,8 @@
  * @see https://github.com/codama-idl/codama
  */
 
-export * from "./borrowedFromSAP1";
-export * from "./borrowedFromSAP2";
-export * from "./failoverTriggered";
 export * from "./impliedVolatilityUpdated";
 export * from "./liquidationExecuted";
-export * from "./liquidityMetrics";
-export * from "./liquidityRouterCreated";
 export * from "./marketDataInitialized";
 export * from "./marketDataUpdated";
 export * from "./optionClosed";
@@ -27,6 +22,5 @@ export * from "./positionDeposited";
 export * from "./positionWithdrawn";
 export * from "./priceFeedMessage";
 export * from "./protocolFeeUpdated";
-export * from "./sap2Provider";
 export * from "./vaultCreated";
 export * from "./verificationLevel";

package/index.ts

@@ -24,3 +24,11 @@ export * from "./short/pool";
 
 export * from "./omlp/builders";
 export * from "./omlp/service";
+
+export {
+  getWrapSOLInstructions,
+  getUnwrapSOLInstructions,
+  getSyncNativeInstruction,
+  getCloseAccountInstruction,
+  NATIVE_MINT,
+} from "./wsol/instructions";

package/omlp/service.ts

@@ -1,3 +1,8 @@
+/**
+ * OMLP (Option Maker Liquidity Pool) service – V2 pool-based API only.
+ * Exposes: depositToPosition, withdrawFromPosition, withdrawAllFromPosition, withdrawInterestFromPosition.
+ * Borrow/repay use short/pool (buildBorrowFromPool*, buildRepayPoolLoan*). Legacy offer-based instructions are not exposed.
+ */
 import { fetchLenderPosition, fetchVault } from "../accounts/fetchers";
 import type { KitRpc } from "../client/types";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "private": false,
   "description": "Solana Option Standard SDK. The frontend-first SDK for Native Options Trading on Solana. Created by Epicentral Labs.",
   "type": "module",
@@ -17,6 +17,7 @@
   "dependencies": {
     "@solana-program/address-lookup-table": "^0.11.0",
     "@solana-program/compute-budget": "^0.13.0",
+    "@solana-program/system": "^0.11.0",
     "@solana/kit": "^6.1.0",
     "bs58": "^6.0.0",
     "decimal.js": "^10.4.3"

package/short/builders.ts

@@ -55,7 +55,6 @@ export interface BuildOptionMintParams {
   escrowAuthority?: AddressLike;
   escrowTokenAccount?: AddressLike;
   poolLoan?: AddressLike;
-  liquidityRouter?: AddressLike;
   remainingAccounts?: RemainingAccountInput[];
 }
 
@@ -168,7 +167,6 @@ export async function buildOptionMintInstruction(
       ? toAddress(params.escrowTokenAccount)
       : undefined,
     poolLoan: params.poolLoan ? toAddress(params.poolLoan) : undefined,
-    liquidityRouter: params.liquidityRouter ? toAddress(params.liquidityRouter) : undefined,
     maker: toAddress(params.maker) as any,
     optionType: params.optionType,
     strikePrice: params.strikePrice,
@@ -210,7 +208,6 @@ export interface BuildOptionMintTransactionWithDerivationParams {
   escrowAuthority?: AddressLike;
   escrowTokenAccount?: AddressLike;
   poolLoan?: AddressLike;
-  liquidityRouter?: AddressLike;
   remainingAccounts?: RemainingAccountInput[];
 }
 
@@ -278,7 +275,6 @@ export async function buildOptionMintTransactionWithDerivation(
     escrowAuthority: params.escrowAuthority,
     escrowTokenAccount: params.escrowTokenAccount,
     poolLoan: params.poolLoan,
-    liquidityRouter: params.liquidityRouter,
     remainingAccounts: params.remainingAccounts,
   });
 }

package/wsol/instructions.ts

@@ -0,0 +1,221 @@
+import {
+  AccountRole,
+  address,
+  isTransactionSigner,
+  type AccountMeta,
+  type Address,
+  type Instruction,
+  type TransactionSigner,
+  upgradeRoleToSigner,
+} from "@solana/kit";
+import { getTransferSolInstruction } from "@solana-program/system";
+import { deriveAssociatedTokenAddress } from "../accounts/pdas";
+import { toAddress } from "../client/program";
+import type { AddressLike, KitRpc } from "../client/types";
+
+/** Wrapped SOL mint address (WSOL). */
+export const NATIVE_MINT = address("So11111111111111111111111111111111111111112");
+
+const TOKEN_PROGRAM_ADDRESS = address("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+const ASSOCIATED_TOKEN_PROGRAM_ADDRESS = address(
+  "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+);
+const SYSTEM_PROGRAM_ADDRESS = address("11111111111111111111111111111111");
+
+/** SPL Token instruction discriminator: SyncNative. */
+const SYNC_NATIVE_DISCRIMINATOR = 17;
+/** SPL Token instruction discriminator: CloseAccount. */
+const CLOSE_ACCOUNT_DISCRIMINATOR = 9;
+/** Associated Token Program instruction discriminator: CreateIdempotent. */
+const CREATE_ASSOCIATED_TOKEN_IDEMPOTENT_DISCRIMINATOR = 1;
+
+/** SPL Token account data: amount field offset (u64 LE). */
+const TOKEN_ACCOUNT_AMOUNT_OFFSET = 64;
+
+function accountMeta(
+  addr: Address,
+  role: AccountRole,
+  signer?: TransactionSigner
+): AccountMeta<string> {
+  const base = { address: addr, role };
+  if (signer !== undefined) {
+    return Object.freeze({ ...base, role: upgradeRoleToSigner(role), signer }) as AccountMeta<string>;
+  }
+  return Object.freeze(base) as AccountMeta<string>;
+}
+
+/**
+ * Builds the SPL Token SyncNative instruction (for WSOL wrap). Syncs the native token
+ * account's amount with its lamport balance.
+ */
+export function getSyncNativeInstruction(
+  account: AddressLike,
+  tokenProgram: AddressLike = TOKEN_PROGRAM_ADDRESS
+): Instruction<string> {
+  const programAddress = toAddress(tokenProgram);
+  return Object.freeze({
+    programAddress,
+    accounts: [
+      accountMeta(toAddress(account), AccountRole.WRITABLE),
+    ],
+    data: new Uint8Array([SYNC_NATIVE_DISCRIMINATOR]),
+  });
+}
+
+/**
+ * Builds the SPL Token CloseAccount instruction (for WSOL unwrap). Closes the token
+ * account and sends lamports to destination. Owner must sign the transaction.
+ */
+export function getCloseAccountInstruction(
+  account: AddressLike,
+  destination: AddressLike,
+  owner: AddressLike | TransactionSigner<string>,
+  tokenProgram: AddressLike = TOKEN_PROGRAM_ADDRESS
+): Instruction<string> {
+  const programAddress = toAddress(tokenProgram);
+  const ownerAddress = toAddress(
+    typeof owner === "object" && owner !== null && "address" in owner
+      ? (owner as TransactionSigner<string>).address
+      : owner
+  );
+  const ownerSigner: TransactionSigner<string> | undefined =
+    typeof owner === "object" && owner !== null && "address" in owner && isTransactionSigner(owner)
+      ? owner
+      : undefined;
+  const ownerMeta: AccountMeta<string> = ownerSigner
+    ? Object.freeze({
+        address: ownerAddress,
+        role: upgradeRoleToSigner(AccountRole.READONLY),
+        signer: ownerSigner,
+      }) as AccountMeta<string>
+    : accountMeta(ownerAddress, AccountRole.READONLY);
+  return Object.freeze({
+    programAddress,
+    accounts: [
+      accountMeta(toAddress(account), AccountRole.WRITABLE),
+      accountMeta(toAddress(destination), AccountRole.WRITABLE),
+      ownerMeta,
+    ],
+    data: new Uint8Array([CLOSE_ACCOUNT_DISCRIMINATOR]),
+  });
+}
+
+/**
+ * Builds the Associated Token Program CreateIdempotent instruction. Safe to add
+ * even if the ATA already exists.
+ */
+async function getCreateAssociatedTokenIdempotentInstruction(
+  payer: TransactionSigner<string>,
+  owner: AddressLike,
+  mint: AddressLike,
+  associatedToken: Address
+): Promise<Instruction<string>> {
+  const programAddress = ASSOCIATED_TOKEN_PROGRAM_ADDRESS;
+  return Object.freeze({
+    programAddress,
+    accounts: [
+      accountMeta(payer.address as Address, AccountRole.WRITABLE, payer),
+      accountMeta(associatedToken, AccountRole.WRITABLE),
+      accountMeta(toAddress(owner), AccountRole.READONLY),
+      accountMeta(toAddress(mint), AccountRole.READONLY),
+      accountMeta(SYSTEM_PROGRAM_ADDRESS, AccountRole.READONLY),
+      accountMeta(TOKEN_PROGRAM_ADDRESS, AccountRole.READONLY),
+    ],
+    data: new Uint8Array([CREATE_ASSOCIATED_TOKEN_IDEMPOTENT_DISCRIMINATOR]),
+  });
+}
+
+/**
+ * Returns instructions to wrap SOL into WSOL: create WSOL ATA (idempotent),
+ * transfer lamports to it, then sync native. Uses SDK's deriveAssociatedTokenAddress.
+ */
+export async function getWrapSOLInstructions(params: {
+  payer: TransactionSigner<string>;
+  lamports: bigint;
+  owner?: AddressLike;
+  tokenProgram?: AddressLike;
+  wsolMint?: AddressLike;
+}): Promise<Instruction<string>[]> {
+  const owner = params.owner ?? params.payer.address;
+  const wsolMint = params.wsolMint ?? NATIVE_MINT;
+  const tokenProgram = params.tokenProgram ?? TOKEN_PROGRAM_ADDRESS;
+
+  const wsolAta = await deriveAssociatedTokenAddress(owner, wsolMint);
+
+  const createAta = await getCreateAssociatedTokenIdempotentInstruction(
+    params.payer,
+    owner,
+    wsolMint,
+    wsolAta
+  );
+
+  const transfer = getTransferSolInstruction({
+    source: params.payer,
+    destination: wsolAta,
+    amount: params.lamports,
+  });
+
+  const syncNative = getSyncNativeInstruction(wsolAta, tokenProgram);
+
+  return [createAta, transfer, syncNative];
+}
+
+/**
+ * Reads token account amount from raw account data (SPL token account layout).
+ */
+function decodeTokenAccountAmount(data: Uint8Array): bigint {
+  if (data.length < TOKEN_ACCOUNT_AMOUNT_OFFSET + 8) return BigInt(0);
+  const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  return view.getBigUint64(TOKEN_ACCOUNT_AMOUNT_OFFSET, true);
+}
+
+/**
+ * Fetches WSOL ATA balance via RPC. Returns 0n if account missing or invalid.
+ */
+async function fetchWsolAtaBalance(rpc: KitRpc, ata: Address): Promise<bigint> {
+  const response = await rpc.getAccountInfo(ata, { encoding: "base64" }).send();
+  const accountInfo = response.value;
+  if (!accountInfo) return BigInt(0);
+  const [b64] = accountInfo.data;
+  if (!b64) return BigInt(0);
+  const binary = atob(b64);
+  const data = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) data[i] = binary.charCodeAt(i);
+  return decodeTokenAccountAmount(data);
+}
+
+/**
+ * Returns the instruction to unwrap WSOL (close WSOL ATA and send SOL to destination),
+ * or null if the WSOL ATA has zero balance. Uses SDK's deriveAssociatedTokenAddress.
+ * Owner must be provided as a signer when the app signs the transaction.
+ */
+export async function getUnwrapSOLInstructions(params: {
+  owner: AddressLike | TransactionSigner<string>;
+  rpc: KitRpc;
+  destination?: AddressLike;
+  tokenProgram?: AddressLike;
+  wsolMint?: AddressLike;
+}): Promise<Instruction<string>[] | null> {
+  const destination = params.destination ?? (typeof params.owner === "object" && params.owner !== null && "address" in params.owner
+    ? (params.owner as TransactionSigner<string>).address
+    : toAddress(params.owner));
+  const wsolMint = params.wsolMint ?? NATIVE_MINT;
+  const tokenProgram = params.tokenProgram ?? TOKEN_PROGRAM_ADDRESS;
+
+  const ownerAddress = toAddress(
+    typeof params.owner === "object" && params.owner !== null && "address" in params.owner
+      ? (params.owner as TransactionSigner<string>).address
+      : params.owner
+  );
+  const wsolAta = await deriveAssociatedTokenAddress(ownerAddress, wsolMint);
+  const balance = await fetchWsolAtaBalance(params.rpc, wsolAta);
+  if (balance === BigInt(0)) return null;
+
+  const close = getCloseAccountInstruction(
+    wsolAta,
+    destination,
+    params.owner,
+    tokenProgram
+  );
+  return [close];
+}