@hadron-fi/sdk 0.3.4 → 0.4.1

package/dist/index.mjs

@@ -1,6 +1,56 @@
+// src/helpers/sol.ts
+import {
+  SystemProgram
+} from "@solana/web3.js";
+import {
+  NATIVE_MINT,
+  createSyncNativeInstruction,
+  createCloseAccountInstruction,
+  TOKEN_PROGRAM_ID
+} from "@solana/spl-token";
+import {
+  getAssociatedTokenAddressSync,
+  createAssociatedTokenAccountIdempotentInstruction
+} from "@solana/spl-token";
+function isNativeMint(mint) {
+  return mint.equals(NATIVE_MINT);
+}
+function wrapSolInstructions(user, lamports) {
+  const ata = getAssociatedTokenAddressSync(NATIVE_MINT, user, false, TOKEN_PROGRAM_ID);
+  return [
+    createAssociatedTokenAccountIdempotentInstruction(
+      user,
+      ata,
+      user,
+      NATIVE_MINT,
+      TOKEN_PROGRAM_ID
+    ),
+    SystemProgram.transfer({
+      fromPubkey: user,
+      toPubkey: ata,
+      lamports
+    }),
+    createSyncNativeInstruction(ata, TOKEN_PROGRAM_ID)
+  ];
+}
+function createWsolAtaInstruction(user) {
+  const ata = getAssociatedTokenAddressSync(NATIVE_MINT, user, false, TOKEN_PROGRAM_ID);
+  return createAssociatedTokenAccountIdempotentInstruction(
+    user,
+    ata,
+    user,
+    NATIVE_MINT,
+    TOKEN_PROGRAM_ID
+  );
+}
+function unwrapSolInstruction(user) {
+  const ata = getAssociatedTokenAddressSync(NATIVE_MINT, user, false, TOKEN_PROGRAM_ID);
+  return createCloseAccountInstruction(ata, user, user, [], TOKEN_PROGRAM_ID);
+}
+
 // src/constants/index.ts
-import { PublicKey } from "@solana/web3.js";
-var HADRON_PROGRAM_ID = new PublicKey(
+import { PublicKey as PublicKey2 } from "@solana/web3.js";
+var HADRON_PROGRAM_ID = new PublicKey2(
   "Q72w4coozA552keKDdeeh2EyQw32qfMFsHPu6cbatom"
 );
 var CONFIG_SEED = Buffer.from("hadron-config");
@@ -49,7 +99,9 @@ var Discriminator = {
   SetPoolState: 21,
   AllocateCurvePrefabs: 22,
   SetQuotingAuthority: 23,
-  RotateFeeAdmin: 24
+  RotateFeeAdmin: 24,
+  InitializePoolFeeConfig: 25,
+  UpdatePoolFeeConfig: 26
 };
 var POINT_DATA_SIZE = 21;
 var CURVE_UPDATE_OP_SIZE = 24;
@@ -58,21 +110,21 @@ function curvePrefabsSize(maxSlots, maxPoints) {
 }
 
 // src/helpers/derive.ts
-import { PublicKey as PublicKey2 } from "@solana/web3.js";
-import { getAssociatedTokenAddressSync } from "@solana/spl-token";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
+import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2 } from "@solana/spl-token";
 function seedToBuffer(seed) {
   const buf = Buffer.alloc(8);
   buf.writeBigUInt64LE(seed);
   return buf;
 }
 function getConfigAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [CONFIG_SEED, seedToBuffer(seed), mintX.toBuffer(), mintY.toBuffer()],
     programId
   );
 }
 function getMidpriceOracleAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       MIDPRICE_ORACLE_SEED,
       seedToBuffer(seed),
@@ -83,13 +135,13 @@ function getMidpriceOracleAddress(seed, mintX, mintY, programId = HADRON_PROGRAM
   );
 }
 function getCurveMetaAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [CURVE_META_SEED, seedToBuffer(seed), mintX.toBuffer(), mintY.toBuffer()],
     programId
   );
 }
 function getCurvePrefabsAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       CURVE_PREFABS_SEED,
       seedToBuffer(seed),
@@ -100,7 +152,7 @@ function getCurvePrefabsAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_I
   );
 }
 function getCurveUpdatesAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [
       CURVE_UPDATES_SEED,
       seedToBuffer(seed),
@@ -111,10 +163,16 @@ function getCurveUpdatesAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_I
   );
 }
 function getFeeConfigAddress(programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync([FEE_CONFIG_SEED], programId);
+  return PublicKey3.findProgramAddressSync([FEE_CONFIG_SEED], programId);
+}
+function getPoolFeeConfigAddress(configPda, programId = HADRON_PROGRAM_ID) {
+  return PublicKey3.findProgramAddressSync(
+    [FEE_CONFIG_SEED, configPda.toBuffer()],
+    programId
+  );
 }
 function getSpreadConfigAddress(configPda, programId = HADRON_PROGRAM_ID) {
-  return PublicKey2.findProgramAddressSync(
+  return PublicKey3.findProgramAddressSync(
     [SPREAD_CONFIG_SEED, configPda.toBuffer()],
     programId
   );
@@ -130,13 +188,13 @@ function derivePoolAddresses(seed, mintX, mintY, tokenProgramX, tokenProgramY, p
   const [curveMeta] = getCurveMetaAddress(seed, mintX, mintY, programId);
   const [curvePrefabs] = getCurvePrefabsAddress(seed, mintX, mintY, programId);
   const [curveUpdates] = getCurveUpdatesAddress(seed, mintX, mintY, programId);
-  const vaultX = getAssociatedTokenAddressSync(
+  const vaultX = getAssociatedTokenAddressSync2(
     mintX,
     config,
     true,
     tokenProgramX
   );
-  const vaultY = getAssociatedTokenAddressSync(
+  const vaultY = getAssociatedTokenAddressSync2(
     mintY,
     config,
     true,
@@ -174,7 +232,7 @@ function spreadQ32ToBps(q32) {
 }
 
 // src/accounts/index.ts
-import { PublicKey as PublicKey3 } from "@solana/web3.js";
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
 
 // src/types/index.ts
 var PoolState = /* @__PURE__ */ ((PoolState3) => {
@@ -235,15 +293,15 @@ function decodeConfig(data) {
   offset += 1;
   const seed = buf.readBigUInt64LE(offset);
   offset += 8;
-  const authority = new PublicKey3(buf.subarray(offset, offset + 32));
+  const authority = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
-  const mintX = new PublicKey3(buf.subarray(offset, offset + 32));
+  const mintX = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
-  const mintY = new PublicKey3(buf.subarray(offset, offset + 32));
+  const mintY = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
   const configBump = buf.readUInt8(offset);
   offset += 1;
-  const curveMeta = new PublicKey3(buf.subarray(offset, offset + 32));
+  const curveMeta = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
   const spreadConfigInitialized = buf.readUInt8(offset) !== 0;
   offset += 1;
@@ -251,14 +309,16 @@ function decodeConfig(data) {
   offset += 1;
   const oracleMode = buf.readUInt8(offset);
   offset += 1;
-  offset += 3;
-  const pendingAuthority = new PublicKey3(buf.subarray(offset, offset + 32));
+  const hasPoolFee = buf.readUInt8(offset) !== 0;
+  offset += 1;
+  offset += 2;
+  const pendingAuthority = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
   const nominationExpiry = buf.readBigUInt64LE(offset);
   offset += 8;
-  const tokenProgramX = new PublicKey3(buf.subarray(offset, offset + 32));
+  const tokenProgramX = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
-  const tokenProgramY = new PublicKey3(buf.subarray(offset, offset + 32));
+  const tokenProgramY = new PublicKey4(buf.subarray(offset, offset + 32));
   return {
     state,
     seed,
@@ -270,6 +330,7 @@ function decodeConfig(data) {
     spreadConfigInitialized,
     deltaStaleness,
     oracleMode,
+    hasPoolFee,
     pendingAuthority,
     nominationExpiry,
     tokenProgramX,
@@ -278,7 +339,7 @@ function decodeConfig(data) {
 }
 function decodeMidpriceOracle(data) {
   const buf = Buffer.from(data);
-  const authority = new PublicKey3(buf.subarray(0, 32));
+  const authority = new PublicKey4(buf.subarray(0, 32));
   const sequence = buf.readBigUInt64LE(32);
   const midpriceQ32 = buf.readBigUInt64LE(40);
   const spreadFactorQ32 = buf.readBigUInt64LE(48);
@@ -288,7 +349,7 @@ function decodeMidpriceOracle(data) {
 function decodeCurveMeta(data) {
   const buf = Buffer.from(data);
   return {
-    authority: new PublicKey3(buf.subarray(0, 32)),
+    authority: new PublicKey4(buf.subarray(0, 32)),
     activePriceBidSlot: buf.readUInt8(32),
     activePriceAskSlot: buf.readUInt8(33),
     activeRiskBidSlot: buf.readUInt8(34),
@@ -311,8 +372,8 @@ function decodeFeeConfig(data) {
     feePpm: buf.readUInt32LE(1),
     bump: buf.readUInt8(5),
     // skip 2 bytes padding
-    feeAdmin: new PublicKey3(buf.subarray(8, 40)),
-    feeRecipient: new PublicKey3(buf.subarray(40, 72))
+    feeAdmin: new PublicKey4(buf.subarray(8, 40)),
+    feeRecipient: new PublicKey4(buf.subarray(40, 72))
   };
 }
 var SPREAD_TRIGGER_LEN = 40;
@@ -321,13 +382,13 @@ function decodeSpreadConfig(data) {
   const initialized = buf.readUInt8(0) !== 0;
   const bump = buf.readUInt8(1);
   const numTriggers = buf.readUInt8(2);
-  const admin = new PublicKey3(buf.subarray(8, 40));
-  const config = new PublicKey3(buf.subarray(40, 72));
+  const admin = new PublicKey4(buf.subarray(8, 40));
+  const config = new PublicKey4(buf.subarray(40, 72));
   const triggers = [];
   const triggersStart = 72;
   for (let i = 0; i < numTriggers; i++) {
     const off = triggersStart + i * SPREAD_TRIGGER_LEN;
-    const account = new PublicKey3(buf.subarray(off, off + 32));
+    const account = new PublicKey4(buf.subarray(off, off + 32));
     const spreadBps = buf.readUInt16LE(off + 32);
     triggers.push({ account, spreadBps });
   }
@@ -336,9 +397,9 @@ function decodeSpreadConfig(data) {
 function decodeCurveUpdates(data) {
   const buf = Buffer.from(data);
   let offset = 0;
-  const authority = new PublicKey3(buf.subarray(offset, offset + 32));
+  const authority = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
-  const curveMeta = new PublicKey3(buf.subarray(offset, offset + 32));
+  const curveMeta = new PublicKey4(buf.subarray(offset, offset + 32));
   offset += 32;
   const numOps = buf.readUInt8(offset);
   offset += 1;
@@ -416,16 +477,16 @@ function decodeActiveCurves(prefabsData, meta) {
 
 // src/instructions/initialize.ts
 import {
-  PublicKey as PublicKey4,
-  SystemProgram,
-  TransactionInstruction
+  PublicKey as PublicKey5,
+  SystemProgram as SystemProgram2,
+  TransactionInstruction as TransactionInstruction2
 } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { ASSOCIATED_TOKEN_PROGRAM_ID, TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2 } from "@solana/spl-token";
 function buildInitialize(payer, params, programId = HADRON_PROGRAM_ID) {
   const seed = params.seed;
   if (seed === void 0) throw new Error("seed is required \u2014 use Hadron.initialize() to auto-generate one");
-  const tokenProgramX = params.tokenProgramX ?? TOKEN_PROGRAM_ID;
-  const tokenProgramY = params.tokenProgramY ?? TOKEN_PROGRAM_ID;
+  const tokenProgramX = params.tokenProgramX ?? TOKEN_PROGRAM_ID2;
+  const tokenProgramY = params.tokenProgramY ?? TOKEN_PROGRAM_ID2;
   const maxPrefabSlots = params.maxPrefabSlots ?? DEFAULT_MAX_PREFAB_SLOTS;
   const maxCurvePoints = params.maxCurvePoints ?? DEFAULT_MAX_CURVE_POINTS;
   const oracleMode = params.oracleMode ?? 0;
@@ -463,7 +524,7 @@ function buildInitialize(payer, params, programId = HADRON_PROGRAM_ID) {
     offset += 1;
     data.writeUInt8(maxCurvePoints, offset);
   }
-  return new TransactionInstruction({
+  return new TransactionInstruction2({
     programId,
     keys: [
       { pubkey: payer, isSigner: true, isWritable: true },
@@ -479,7 +540,7 @@ function buildInitialize(payer, params, programId = HADRON_PROGRAM_ID) {
         isSigner: false,
         isWritable: false
       },
-      { pubkey: SystemProgram.programId, isSigner: false, isWritable: false },
+      { pubkey: SystemProgram2.programId, isSigner: false, isWritable: false },
       { pubkey: addrs.midpriceOracle, isSigner: false, isWritable: true },
       { pubkey: addrs.curveMeta, isSigner: false, isWritable: true },
       { pubkey: addrs.curvePrefabs, isSigner: false, isWritable: true },
@@ -491,7 +552,7 @@ function buildInitialize(payer, params, programId = HADRON_PROGRAM_ID) {
 function buildAllocateCurvePrefabs(payer, params, programId = HADRON_PROGRAM_ID) {
   const maxPrefabSlots = params.maxPrefabSlots ?? DEFAULT_MAX_PREFAB_SLOTS;
   const maxCurvePoints = params.maxCurvePoints ?? DEFAULT_MAX_CURVE_POINTS;
-  const data = Buffer.alloc(1 + 8 + 32 + 32 + 1 + 1);
+  const data = Buffer.alloc(1 + 8 + 32 + 32 + 1 + 1 + 32);
   let offset = 0;
   data.writeUInt8(Discriminator.AllocateCurvePrefabs, offset);
   offset += 1;
@@ -504,7 +565,9 @@ function buildAllocateCurvePrefabs(payer, params, programId = HADRON_PROGRAM_ID)
   data.writeUInt8(maxPrefabSlots, offset);
   offset += 1;
   data.writeUInt8(maxCurvePoints, offset);
-  const [curvePrefabsPda] = PublicKey4.findProgramAddressSync(
+  offset += 1;
+  params.authority.toBuffer().copy(data, offset);
+  const [curvePrefabsPda] = PublicKey5.findProgramAddressSync(
     [
       Buffer.from("hadron-curve-prefabs"),
       (() => {
@@ -517,20 +580,20 @@ function buildAllocateCurvePrefabs(payer, params, programId = HADRON_PROGRAM_ID)
     ],
     programId
   );
-  return new TransactionInstruction({
+  return new TransactionInstruction2({
     programId,
     keys: [
       { pubkey: payer, isSigner: true, isWritable: true },
       { pubkey: curvePrefabsPda, isSigner: false, isWritable: true },
-      { pubkey: SystemProgram.programId, isSigner: false, isWritable: false }
+      { pubkey: SystemProgram2.programId, isSigner: false, isWritable: false }
     ],
     data
   });
 }
 
 // src/instructions/deposit.ts
-import { TransactionInstruction as TransactionInstruction2 } from "@solana/web3.js";
-import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2 } from "@solana/spl-token";
+import { TransactionInstruction as TransactionInstruction3 } from "@solana/web3.js";
+import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync3 } from "@solana/spl-token";
 function buildDeposit(user, configPda, mintX, mintY, tokenProgramX, tokenProgramY, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 8 + 8 + 8);
   let offset = 0;
@@ -542,11 +605,11 @@ function buildDeposit(user, configPda, mintX, mintY, tokenProgramX, tokenProgram
   offset += 8;
   const exp = params.expiration ?? Math.floor(Date.now() / 1e3) + 3600;
   data.writeBigInt64LE(BigInt(exp), offset);
-  const userX = getAssociatedTokenAddressSync2(mintX, user, false, tokenProgramX);
-  const userY = getAssociatedTokenAddressSync2(mintY, user, false, tokenProgramY);
-  const vaultX = getAssociatedTokenAddressSync2(mintX, configPda, true, tokenProgramX);
-  const vaultY = getAssociatedTokenAddressSync2(mintY, configPda, true, tokenProgramY);
-  return new TransactionInstruction2({
+  const userX = getAssociatedTokenAddressSync3(mintX, user, false, tokenProgramX);
+  const userY = getAssociatedTokenAddressSync3(mintY, user, false, tokenProgramY);
+  const vaultX = getAssociatedTokenAddressSync3(mintX, configPda, true, tokenProgramX);
+  const vaultY = getAssociatedTokenAddressSync3(mintY, configPda, true, tokenProgramY);
+  return new TransactionInstruction3({
     programId,
     keys: [
       { pubkey: user, isSigner: true, isWritable: false },
@@ -563,8 +626,8 @@ function buildDeposit(user, configPda, mintX, mintY, tokenProgramX, tokenProgram
 }
 
 // src/instructions/withdraw.ts
-import { TransactionInstruction as TransactionInstruction3 } from "@solana/web3.js";
-import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync3 } from "@solana/spl-token";
+import { TransactionInstruction as TransactionInstruction4 } from "@solana/web3.js";
+import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync4 } from "@solana/spl-token";
 function buildWithdraw(user, configPda, mintX, mintY, tokenProgramX, tokenProgramY, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 8 + 8 + 8);
   let offset = 0;
@@ -576,11 +639,11 @@ function buildWithdraw(user, configPda, mintX, mintY, tokenProgramX, tokenProgra
   offset += 8;
   const exp = params.expiration ?? Math.floor(Date.now() / 1e3) + 3600;
   data.writeBigInt64LE(BigInt(exp), offset);
-  const userX = getAssociatedTokenAddressSync3(mintX, user, false, tokenProgramX);
-  const userY = getAssociatedTokenAddressSync3(mintY, user, false, tokenProgramY);
-  const vaultX = getAssociatedTokenAddressSync3(mintX, configPda, true, tokenProgramX);
-  const vaultY = getAssociatedTokenAddressSync3(mintY, configPda, true, tokenProgramY);
-  return new TransactionInstruction3({
+  const userX = getAssociatedTokenAddressSync4(mintX, user, false, tokenProgramX);
+  const userY = getAssociatedTokenAddressSync4(mintY, user, false, tokenProgramY);
+  const vaultX = getAssociatedTokenAddressSync4(mintX, configPda, true, tokenProgramX);
+  const vaultY = getAssociatedTokenAddressSync4(mintY, configPda, true, tokenProgramY);
+  return new TransactionInstruction4({
     programId,
     keys: [
       { pubkey: user, isSigner: true, isWritable: false },
@@ -600,10 +663,10 @@ function buildWithdraw(user, configPda, mintX, mintY, tokenProgramX, tokenProgra
 import {
   SYSVAR_CLOCK_PUBKEY,
   SYSVAR_INSTRUCTIONS_PUBKEY,
-  TransactionInstruction as TransactionInstruction4
+  TransactionInstruction as TransactionInstruction5
 } from "@solana/web3.js";
-import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync4 } from "@solana/spl-token";
-function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, tokenProgramY, params, programId = HADRON_PROGRAM_ID, spreadConfigInitialized = false) {
+import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync5 } from "@solana/spl-token";
+function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, tokenProgramY, params, programId = HADRON_PROGRAM_ID, spreadConfigInitialized = false, feeConfigOverride) {
   const data = Buffer.alloc(1 + 1 + 8 + 8 + 8);
   let offset = 0;
   data.writeUInt8(Discriminator.SwapExactIn, offset);
@@ -616,13 +679,13 @@ function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, toke
   offset += 8;
   const exp = params.expiration ?? Math.floor(Date.now() / 1e3) + 3600;
   data.writeBigInt64LE(BigInt(exp), offset);
-  const userX = getAssociatedTokenAddressSync4(mintX, user, false, tokenProgramX);
-  const userY = getAssociatedTokenAddressSync4(mintY, user, false, tokenProgramY);
+  const userX = getAssociatedTokenAddressSync5(mintX, user, false, tokenProgramX);
+  const userY = getAssociatedTokenAddressSync5(mintY, user, false, tokenProgramY);
   const [userSource, vaultSource, vaultDest, userDest] = params.isX ? [userX, poolAddresses.vaultX, poolAddresses.vaultY, userY] : [userY, poolAddresses.vaultY, poolAddresses.vaultX, userX];
-  const [feeConfigPda] = getFeeConfigAddress(programId);
+  const feeConfigPda = feeConfigOverride ?? getFeeConfigAddress(programId)[0];
   const inputMint = params.isX ? mintX : mintY;
   const inputMintProgram = params.isX ? tokenProgramX : tokenProgramY;
-  const feeRecipientAta = getAssociatedTokenAddressSync4(
+  const feeRecipientAta = getAssociatedTokenAddressSync5(
     inputMint,
     params.feeRecipient,
     false,
@@ -669,7 +732,7 @@ function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, toke
       { pubkey: SYSVAR_INSTRUCTIONS_PUBKEY, isSigner: false, isWritable: false }
     );
   }
-  return new TransactionInstruction4({
+  return new TransactionInstruction5({
     programId,
     keys,
     data
@@ -677,7 +740,7 @@ function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, toke
 }
 
 // src/instructions/setCurve.ts
-import { TransactionInstruction as TransactionInstruction5 } from "@solana/web3.js";
+import { TransactionInstruction as TransactionInstruction6 } from "@solana/web3.js";
 function interpolationToByte(interp) {
   return interp;
 }
@@ -713,7 +776,7 @@ function buildSetCurve(authority, curveMetaPda, curvePrefabsPda, params, program
     Buffer.from(params_).copy(data, offset, 0, 4);
     offset += 4;
   }
-  return new TransactionInstruction5({
+  return new TransactionInstruction6({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -760,7 +823,7 @@ function buildSetRiskCurve(authority, curveMetaPda, curvePrefabsPda, params, pro
     Buffer.from(params_).copy(data, offset, 0, 4);
     offset += 4;
   }
-  return new TransactionInstruction5({
+  return new TransactionInstruction6({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -806,7 +869,7 @@ function buildSetRiskCurveAbsolute(authority, curveMetaPda, curvePrefabsPda, par
     Buffer.from(params_).copy(data, offset, 0, 4);
     offset += 4;
   }
-  return new TransactionInstruction5({
+  return new TransactionInstruction6({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -835,14 +898,14 @@ function buildSetRiskCurveAbsoluteBoth(authority, curveMetaPda, curvePrefabsPda,
 // src/instructions/oracle.ts
 import {
   SYSVAR_CLOCK_PUBKEY as SYSVAR_CLOCK_PUBKEY2,
-  TransactionInstruction as TransactionInstruction6
+  TransactionInstruction as TransactionInstruction7
 } from "@solana/web3.js";
 function buildUpdateMidprice(authority, midpriceOraclePda, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 8 + 8);
   data.writeUInt8(Discriminator.UpdateMidprice, 0);
   data.writeBigUInt64LE(params.sequence ?? 0n, 1);
   data.writeBigUInt64LE(params.midpriceQ32, 9);
-  return new TransactionInstruction6({
+  return new TransactionInstruction7({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -857,7 +920,7 @@ function buildUpdateBaseSpread(authority, midpriceOraclePda, params, programId =
   data.writeUInt8(Discriminator.UpdateBaseSpread, 0);
   data.writeBigUInt64LE(params.sequence ?? 0n, 1);
   data.writeBigUInt64LE(params.spreadFactorQ32, 9);
-  return new TransactionInstruction6({
+  return new TransactionInstruction7({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -873,7 +936,7 @@ function buildUpdateMidpriceAndBaseSpread(authority, midpriceOraclePda, params,
   data.writeBigUInt64LE(params.sequence ?? 0n, 1);
   data.writeBigUInt64LE(params.midpriceQ32, 9);
   data.writeBigUInt64LE(params.spreadFactorQ32, 17);
-  return new TransactionInstruction6({
+  return new TransactionInstruction7({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -885,13 +948,13 @@ function buildUpdateMidpriceAndBaseSpread(authority, midpriceOraclePda, params,
 }
 
 // src/instructions/switchCurve.ts
-import { TransactionInstruction as TransactionInstruction7 } from "@solana/web3.js";
+import { TransactionInstruction as TransactionInstruction8 } from "@solana/web3.js";
 function buildSwitchPriceCurve(authority, curveMetaPda, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 1 + 1);
   data.writeUInt8(Discriminator.SwitchPriceCurve, 0);
   data.writeUInt8(params.side, 1);
   data.writeUInt8(params.slot, 2);
-  return new TransactionInstruction7({
+  return new TransactionInstruction8({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -905,7 +968,7 @@ function buildSwitchRiskCurve(authority, curveMetaPda, params, programId = HADRO
   data.writeUInt8(Discriminator.SwitchRiskCurve, 0);
   data.writeUInt8(params.side, 1);
   data.writeUInt8(params.slot, 2);
-  return new TransactionInstruction7({
+  return new TransactionInstruction8({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -916,7 +979,7 @@ function buildSwitchRiskCurve(authority, curveMetaPda, params, programId = HADRO
 }
 
 // src/instructions/curveUpdates.ts
-import { TransactionInstruction as TransactionInstruction8 } from "@solana/web3.js";
+import { TransactionInstruction as TransactionInstruction9 } from "@solana/web3.js";
 function buildSubmitCurveUpdates(authority, curveUpdatesPda, ops, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 1 + ops.length * CURVE_UPDATE_OP_SIZE);
   let offset = 0;
@@ -941,7 +1004,7 @@ function buildSubmitCurveUpdates(authority, curveUpdatesPda, ops, programId = HA
     Buffer.from(params).copy(data, offset, 0, 4);
     offset += 4;
   }
-  return new TransactionInstruction8({
+  return new TransactionInstruction9({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -953,7 +1016,7 @@ function buildSubmitCurveUpdates(authority, curveUpdatesPda, ops, programId = HA
 function buildApplyCurveUpdates(authority, curveMetaPda, curvePrefabsPda, curveUpdatesPda, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1);
   data.writeUInt8(Discriminator.ApplyCurveUpdates, 0);
-  return new TransactionInstruction8({
+  return new TransactionInstruction9({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -968,7 +1031,7 @@ function buildApplyCurveUpdates(authority, curveMetaPda, curvePrefabsPda, curveU
 // src/instructions/authority.ts
 import {
   SYSVAR_CLOCK_PUBKEY as SYSVAR_CLOCK_PUBKEY3,
-  TransactionInstruction as TransactionInstruction9
+  TransactionInstruction as TransactionInstruction10
 } from "@solana/web3.js";
 function buildNominateAuthority(authority, configPda, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 32 + 8);
@@ -978,7 +1041,7 @@ function buildNominateAuthority(authority, configPda, params, programId = HADRON
   params.newAuthority.toBuffer().copy(data, offset);
   offset += 32;
   data.writeBigUInt64LE(params.expirySlot, offset);
-  return new TransactionInstruction9({
+  return new TransactionInstruction10({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -991,7 +1054,7 @@ function buildNominateAuthority(authority, configPda, params, programId = HADRON
 function buildAcceptAuthority(newAuthority, configPda, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1);
   data.writeUInt8(Discriminator.AcceptAuthority, 0);
-  return new TransactionInstruction9({
+  return new TransactionInstruction10({
     programId,
     keys: [
       { pubkey: newAuthority, isSigner: true, isWritable: false },
@@ -1019,7 +1082,7 @@ function buildSetQuotingAuthority(authority, configPda, oraclePda, curveMetaPda,
       isWritable: true
     });
   }
-  return new TransactionInstruction9({
+  return new TransactionInstruction10({
     programId,
     keys,
     data
@@ -1028,8 +1091,8 @@ function buildSetQuotingAuthority(authority, configPda, oraclePda, curveMetaPda,
 
 // src/instructions/feeConfig.ts
 import {
-  SystemProgram as SystemProgram2,
-  TransactionInstruction as TransactionInstruction10
+  SystemProgram as SystemProgram3,
+  TransactionInstruction as TransactionInstruction11
 } from "@solana/web3.js";
 function buildInitializeFeeConfig(payer, authority, params, programId = HADRON_PROGRAM_ID) {
   const [feeConfigPda] = getFeeConfigAddress(programId);
@@ -1042,13 +1105,13 @@ function buildInitializeFeeConfig(payer, authority, params, programId = HADRON_P
   params.feeAdmin.toBuffer().copy(data, offset);
   offset += 32;
   params.feeRecipient.toBuffer().copy(data, offset);
-  return new TransactionInstruction10({
+  return new TransactionInstruction11({
     programId,
     keys: [
       { pubkey: payer, isSigner: true, isWritable: true },
       { pubkey: authority, isSigner: true, isWritable: false },
       { pubkey: feeConfigPda, isSigner: false, isWritable: true },
-      { pubkey: SystemProgram2.programId, isSigner: false, isWritable: false }
+      { pubkey: SystemProgram3.programId, isSigner: false, isWritable: false }
     ],
     data
   });
@@ -1064,7 +1127,7 @@ function buildUpdateFeeConfig(feeAdmin, params, programId = HADRON_PROGRAM_ID) {
   if (params.feeRecipient) {
     params.feeRecipient.toBuffer().copy(data, offset);
   }
-  return new TransactionInstruction10({
+  return new TransactionInstruction11({
     programId,
     keys: [
       { pubkey: feeAdmin, isSigner: true, isWritable: false },
@@ -1078,7 +1141,7 @@ function buildRotateFeeAdmin(feeAdmin, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 32);
   data.writeUInt8(Discriminator.RotateFeeAdmin, 0);
   params.newFeeAdmin.toBuffer().copy(data, 1);
-  return new TransactionInstruction10({
+  return new TransactionInstruction11({
     programId,
     keys: [
       { pubkey: feeAdmin, isSigner: true, isWritable: false },
@@ -1087,25 +1150,71 @@ function buildRotateFeeAdmin(feeAdmin, params, programId = HADRON_PROGRAM_ID) {
     data
   });
 }
+function buildInitializePoolFeeConfig(payer, feeAdmin, configPda, params, programId = HADRON_PROGRAM_ID) {
+  const [poolFeeConfigPda] = getPoolFeeConfigAddress(configPda, programId);
+  const [globalFeeConfigPda] = getFeeConfigAddress(programId);
+  const data = Buffer.alloc(1 + 4 + 32 + 32);
+  let offset = 0;
+  data.writeUInt8(Discriminator.InitializePoolFeeConfig, offset);
+  offset += 1;
+  data.writeUInt32LE(params.feePpm, offset);
+  offset += 4;
+  params.feeAdmin.toBuffer().copy(data, offset);
+  offset += 32;
+  params.feeRecipient.toBuffer().copy(data, offset);
+  return new TransactionInstruction11({
+    programId,
+    keys: [
+      { pubkey: payer, isSigner: true, isWritable: true },
+      { pubkey: feeAdmin, isSigner: true, isWritable: false },
+      { pubkey: configPda, isSigner: false, isWritable: true },
+      { pubkey: poolFeeConfigPda, isSigner: false, isWritable: true },
+      { pubkey: globalFeeConfigPda, isSigner: false, isWritable: false },
+      { pubkey: SystemProgram3.programId, isSigner: false, isWritable: false }
+    ],
+    data
+  });
+}
+function buildUpdatePoolFeeConfig(feeAdmin, configPda, params, programId = HADRON_PROGRAM_ID) {
+  const [poolFeeConfigPda] = getPoolFeeConfigAddress(configPda, programId);
+  const data = Buffer.alloc(1 + 4 + 32);
+  let offset = 0;
+  data.writeUInt8(Discriminator.UpdatePoolFeeConfig, offset);
+  offset += 1;
+  data.writeUInt32LE(params.feePpm !== null ? params.feePpm : 4294967295, offset);
+  offset += 4;
+  if (params.feeRecipient) {
+    params.feeRecipient.toBuffer().copy(data, offset);
+  }
+  return new TransactionInstruction11({
+    programId,
+    keys: [
+      { pubkey: feeAdmin, isSigner: true, isWritable: false },
+      { pubkey: configPda, isSigner: false, isWritable: false },
+      { pubkey: poolFeeConfigPda, isSigner: false, isWritable: true }
+    ],
+    data
+  });
+}
 
 // src/instructions/spreadConfig.ts
 import {
-  SystemProgram as SystemProgram3,
-  TransactionInstruction as TransactionInstruction11
+  SystemProgram as SystemProgram4,
+  TransactionInstruction as TransactionInstruction12
 } from "@solana/web3.js";
 function buildInitializeSpreadConfig(payer, authority, configPda, params, programId = HADRON_PROGRAM_ID) {
   const [spreadConfigPda] = getSpreadConfigAddress(configPda, programId);
   const data = Buffer.alloc(1 + 32);
   data.writeUInt8(Discriminator.InitializeSpreadConfig, 0);
   params.admin.toBuffer().copy(data, 1);
-  return new TransactionInstruction11({
+  return new TransactionInstruction12({
     programId,
     keys: [
       { pubkey: payer, isSigner: true, isWritable: true },
       { pubkey: authority, isSigner: true, isWritable: false },
       { pubkey: configPda, isSigner: false, isWritable: true },
       { pubkey: spreadConfigPda, isSigner: false, isWritable: true },
-      { pubkey: SystemProgram3.programId, isSigner: false, isWritable: false }
+      { pubkey: SystemProgram4.programId, isSigner: false, isWritable: false }
     ],
     data
   });
@@ -1125,7 +1234,7 @@ function buildUpdateSpreadConfig(admin, configPda, params, programId = HADRON_PR
     data.writeUInt16LE(t.spreadBps, offset);
     offset += 2;
   }
-  return new TransactionInstruction11({
+  return new TransactionInstruction12({
     programId,
     keys: [
       { pubkey: admin, isSigner: true, isWritable: false },
@@ -1138,13 +1247,13 @@ function buildUpdateSpreadConfig(admin, configPda, params, programId = HADRON_PR
 
 // src/instructions/poolState.ts
 import {
-  TransactionInstruction as TransactionInstruction12
+  TransactionInstruction as TransactionInstruction13
 } from "@solana/web3.js";
 function buildSetPoolState(authority, configPda, params, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1 + 1);
   data.writeUInt8(Discriminator.SetPoolState, 0);
   data.writeUInt8(params.newState, 1);
-  return new TransactionInstruction12({
+  return new TransactionInstruction13({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -1157,7 +1266,7 @@ function buildUpdateDeltaStaleness(authority, configPda, params, programId = HAD
   const data = Buffer.alloc(1 + 1);
   data.writeUInt8(Discriminator.UpdateDeltaStaleness, 0);
   data.writeUInt8(params.deltaStaleness, 1);
-  return new TransactionInstruction12({
+  return new TransactionInstruction13({
     programId,
     keys: [
       { pubkey: authority, isSigner: true, isWritable: false },
@@ -1166,7 +1275,7 @@ function buildUpdateDeltaStaleness(authority, configPda, params, programId = HAD
     data
   });
 }
-function buildClosePool(authority, configPda, midpriceOraclePda, curveMetaPda, curvePrefabsPda, curveUpdatesPda, vaultX, vaultY, tokenProgramX, tokenProgramY, spreadConfigInitialized = false, programId = HADRON_PROGRAM_ID) {
+function buildClosePool(authority, configPda, midpriceOraclePda, curveMetaPda, curvePrefabsPda, curveUpdatesPda, vaultX, vaultY, tokenProgramX, tokenProgramY, spreadConfigInitialized = false, authorityAtaX, authorityAtaY, programId = HADRON_PROGRAM_ID) {
   const data = Buffer.alloc(1);
   data.writeUInt8(Discriminator.ClosePool, 0);
   const keys = [
@@ -1189,7 +1298,13 @@ function buildClosePool(authority, configPda, midpriceOraclePda, curveMetaPda, c
       isWritable: true
     });
   }
-  return new TransactionInstruction12({ programId, keys, data });
+  if (authorityAtaX) {
+    keys.push({ pubkey: authorityAtaX, isSigner: false, isWritable: true });
+  }
+  if (authorityAtaY) {
+    keys.push({ pubkey: authorityAtaY, isSigner: false, isWritable: true });
+  }
+  return new TransactionInstruction13({ programId, keys, data });
 }
 
 // src/hadron.ts
@@ -1290,7 +1405,8 @@ var Hadron = class _Hadron {
       mintX: params.mintX,
       mintY: params.mintY,
       maxPrefabSlots,
-      maxCurvePoints
+      maxCurvePoints,
+      authority: params.authority
     };
     const instructions = [];
     const size = curvePrefabsSize(maxPrefabSlots, maxCurvePoints);
@@ -1633,7 +1749,7 @@ var Hadron = class _Hadron {
     return decoded.triggers;
   }
   /** Build close pool instruction. */
-  closePool(authority) {
+  closePool(authority, authorityAtaX, authorityAtaY) {
     return buildClosePool(
       authority,
       this.poolAddress,
@@ -1646,9 +1762,66 @@ var Hadron = class _Hadron {
       this.config.tokenProgramX,
       this.config.tokenProgramY,
       this.config.spreadConfigInitialized,
+      authorityAtaX,
+      authorityAtaY,
       this.programId
     );
   }
+  // ==========================================================================
+  // SOL Wrapping Convenience Methods
+  // ==========================================================================
+  /**
+   * Build deposit instructions with automatic SOL wrapping.
+   * If mint X or Y is native SOL, prepends wrap instructions for that side.
+   */
+  depositSol(user, params) {
+    const ixs = [];
+    if (isNativeMint(this.config.mintX) && params.amountX > 0n) {
+      ixs.push(...wrapSolInstructions(user, params.amountX));
+    }
+    if (isNativeMint(this.config.mintY) && params.amountY > 0n) {
+      ixs.push(...wrapSolInstructions(user, params.amountY));
+    }
+    ixs.push(this.deposit(user, params));
+    return ixs;
+  }
+  /**
+   * Build withdraw instructions with automatic SOL unwrapping.
+   * Creates wSOL ATA (so program can transfer into it), withdraws, then closes ATA.
+   */
+  withdrawSol(user, params) {
+    const ixs = [];
+    const hasSol = isNativeMint(this.config.mintX) || isNativeMint(this.config.mintY);
+    if (hasSol) {
+      ixs.push(createWsolAtaInstruction(user));
+    }
+    ixs.push(this.withdraw(user, params));
+    if (hasSol) {
+      ixs.push(unwrapSolInstruction(user));
+    }
+    return ixs;
+  }
+  /**
+   * Build swap instructions with automatic SOL wrapping/unwrapping.
+   * Wraps SOL if the input side is native, unwraps if the output side is native.
+   */
+  swapSol(user, params) {
+    const ixs = [];
+    const inputIsX = params.isX;
+    const inputMint = inputIsX ? this.config.mintX : this.config.mintY;
+    const outputMint = inputIsX ? this.config.mintY : this.config.mintX;
+    if (isNativeMint(inputMint)) {
+      ixs.push(...wrapSolInstructions(user, params.amountIn));
+    }
+    if (isNativeMint(outputMint)) {
+      ixs.push(createWsolAtaInstruction(user));
+    }
+    ixs.push(this.swap(user, params));
+    if (isNativeMint(outputMint)) {
+      ixs.push(unwrapSolInstruction(user));
+    }
+    return ixs;
+  }
 };
 
 // src/orderbook.ts
@@ -2212,12 +2385,12 @@ var HadronOrderbook = class _HadronOrderbook {
 
 // src/helpers/token.ts
 import {
-  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync5,
+  getAssociatedTokenAddressSync as getAssociatedTokenAddressSync6,
   createAssociatedTokenAccountInstruction,
-  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2
+  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID3
 } from "@solana/spl-token";
-async function getOrCreateAta(connection, mint, owner, payer, tokenProgram = TOKEN_PROGRAM_ID2, allowOwnerOffCurve = false) {
-  const address = getAssociatedTokenAddressSync5(
+async function getOrCreateAta(connection, mint, owner, payer, tokenProgram = TOKEN_PROGRAM_ID3, allowOwnerOffCurve = false) {
+  const address = getAssociatedTokenAddressSync6(
     mint,
     owner,
     allowOwnerOffCurve,
@@ -2265,6 +2438,7 @@ export {
   MAX_SETCURVE_POINTS,
   MIDPRICE_ORACLE_SEED,
   MIDPRICE_ORACLE_SIZE,
+  NATIVE_MINT,
   OracleMode,
   POINT_DATA_SIZE,
   PoolState,
@@ -2279,6 +2453,7 @@ export {
   buildDeposit,
   buildInitialize,
   buildInitializeFeeConfig,
+  buildInitializePoolFeeConfig,
   buildInitializeSpreadConfig,
   buildNominateAuthority,
   buildRotateFeeAdmin,
@@ -2299,8 +2474,10 @@ export {
   buildUpdateFeeConfig,
   buildUpdateMidprice,
   buildUpdateMidpriceAndBaseSpread,
+  buildUpdatePoolFeeConfig,
   buildUpdateSpreadConfig,
   buildWithdraw,
+  createWsolAtaInstruction,
   curvePrefabsSize,
   decodeActiveCurves,
   decodeConfig,
@@ -2319,11 +2496,15 @@ export {
   getFeeConfigAddress,
   getMidpriceOracleAddress,
   getOrCreateAta,
+  getPoolFeeConfigAddress,
   getSpreadConfigAddress,
+  isNativeMint,
   isSlotInitialized,
   pctToQ32,
   spreadBpsToQ32,
   spreadQ32ToBps,
-  toQ32
+  toQ32,
+  unwrapSolInstruction,
+  wrapSolInstructions
 };
 //# sourceMappingURL=index.mjs.map