@hadron-fi/sdk 0.4.0 → 0.4.2

package/dist/index.mjs

@@ -1,3 +1,6 @@
+// src/hadron.ts
+import { TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID3 } from "@solana/spl-token";
+
 // src/helpers/sol.ts
 import {
   SystemProgram
@@ -43,9 +46,38 @@ function createWsolAtaInstruction(user) {
     TOKEN_PROGRAM_ID
   );
 }
-function unwrapSolInstruction(user) {
+function unwrapSolInstructions(user) {
   const ata = getAssociatedTokenAddressSync(NATIVE_MINT, user, false, TOKEN_PROGRAM_ID);
-  return createCloseAccountInstruction(ata, user, user, [], TOKEN_PROGRAM_ID);
+  return [
+    createCloseAccountInstruction(ata, user, user, [], TOKEN_PROGRAM_ID),
+    createAssociatedTokenAccountIdempotentInstruction(
+      user,
+      ata,
+      user,
+      NATIVE_MINT,
+      TOKEN_PROGRAM_ID
+    )
+  ];
+}
+function buildFeeRecipientAtaIxs(payer, feeRecipient, mintX, mintY, tokenProgramX = TOKEN_PROGRAM_ID, tokenProgramY = TOKEN_PROGRAM_ID) {
+  const ataX = getAssociatedTokenAddressSync(mintX, feeRecipient, false, tokenProgramX);
+  const ataY = getAssociatedTokenAddressSync(mintY, feeRecipient, false, tokenProgramY);
+  return [
+    createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      ataX,
+      feeRecipient,
+      mintX,
+      tokenProgramX
+    ),
+    createAssociatedTokenAccountIdempotentInstruction(
+      payer,
+      ataY,
+      feeRecipient,
+      mintY,
+      tokenProgramY
+    )
+  ];
 }
 
 // src/constants/index.ts
@@ -99,7 +131,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;
@@ -163,6 +197,12 @@ function getCurveUpdatesAddress(seed, mintX, mintY, programId = HADRON_PROGRAM_I
 function getFeeConfigAddress(programId = HADRON_PROGRAM_ID) {
   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 PublicKey3.findProgramAddressSync(
     [SPREAD_CONFIG_SEED, configPda.toBuffer()],
@@ -301,7 +341,9 @@ function decodeConfig(data) {
   offset += 1;
   const oracleMode = buf.readUInt8(offset);
   offset += 1;
-  offset += 3;
+  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);
@@ -320,6 +362,7 @@ function decodeConfig(data) {
     spreadConfigInitialized,
     deltaStaleness,
     oracleMode,
+    hasPoolFee,
     pendingAuthority,
     nominationExpiry,
     tokenProgramX,
@@ -541,7 +584,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;
@@ -554,6 +597,8 @@ function buildAllocateCurvePrefabs(payer, params, programId = HADRON_PROGRAM_ID)
   data.writeUInt8(maxPrefabSlots, offset);
   offset += 1;
   data.writeUInt8(maxCurvePoints, offset);
+  offset += 1;
+  params.authority.toBuffer().copy(data, offset);
   const [curvePrefabsPda] = PublicKey5.findProgramAddressSync(
     [
       Buffer.from("hadron-curve-prefabs"),
@@ -653,7 +698,7 @@ import {
   TransactionInstruction as TransactionInstruction5
 } from "@solana/web3.js";
 import { getAssociatedTokenAddressSync as getAssociatedTokenAddressSync5 } from "@solana/spl-token";
-function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, tokenProgramY, params, programId = HADRON_PROGRAM_ID, spreadConfigInitialized = false) {
+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);
@@ -669,7 +714,7 @@ function buildSwapExactIn(user, poolAddresses, mintX, mintY, tokenProgramX, toke
   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 = getAssociatedTokenAddressSync5(
@@ -1137,6 +1182,52 @@ 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 {
@@ -1216,7 +1307,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 = [
@@ -1239,6 +1330,12 @@ function buildClosePool(authority, configPda, midpriceOraclePda, curveMetaPda, c
       isWritable: true
     });
   }
+  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 });
 }
 
@@ -1340,7 +1437,8 @@ var Hadron = class _Hadron {
       mintX: params.mintX,
       mintY: params.mintY,
       maxPrefabSlots,
-      maxCurvePoints
+      maxCurvePoints,
+      authority: params.authority
     };
     const instructions = [];
     const size = curvePrefabsSize(maxPrefabSlots, maxCurvePoints);
@@ -1351,6 +1449,22 @@ var Hadron = class _Hadron {
     instructions.push(buildInitialize(payer, resolvedParams, programId));
     return { instructions, poolAddress, seed };
   }
+  /**
+   * Build idempotent create-ATA instructions for the fee recipient for both mints.
+   *
+   * These are no-ops on-chain if the ATAs already exist. Include them alongside
+   * initialize or first deposit to ensure swaps don't fail due to missing fee ATAs.
+   */
+  static buildFeeRecipientAtaIxs(payer, feeRecipient, mintX, mintY, tokenProgramX, tokenProgramY) {
+    return buildFeeRecipientAtaIxs(
+      payer,
+      feeRecipient,
+      mintX,
+      mintY,
+      tokenProgramX ?? TOKEN_PROGRAM_ID3,
+      tokenProgramY ?? TOKEN_PROGRAM_ID3
+    );
+  }
   /** Generate a random u64 seed. */
   static randomSeed() {
     const buf = new Uint8Array(8);
@@ -1683,7 +1797,7 @@ var Hadron = class _Hadron {
     return decoded.triggers;
   }
   /** Build close pool instruction. */
-  closePool(authority) {
+  closePool(authority, authorityAtaX, authorityAtaY) {
     return buildClosePool(
       authority,
       this.poolAddress,
@@ -1696,6 +1810,8 @@ var Hadron = class _Hadron {
       this.config.tokenProgramX,
       this.config.tokenProgramY,
       this.config.spreadConfigInitialized,
+      authorityAtaX,
+      authorityAtaY,
       this.programId
     );
   }
@@ -1729,7 +1845,7 @@ var Hadron = class _Hadron {
     }
     ixs.push(this.withdraw(user, params));
     if (hasSol) {
-      ixs.push(unwrapSolInstruction(user));
+      ixs.push(...unwrapSolInstructions(user));
     }
     return ixs;
   }
@@ -1750,7 +1866,7 @@ var Hadron = class _Hadron {
     }
     ixs.push(this.swap(user, params));
     if (isNativeMint(outputMint)) {
-      ixs.push(unwrapSolInstruction(user));
+      ixs.push(...unwrapSolInstructions(user));
     }
     return ixs;
   }
@@ -2319,9 +2435,9 @@ var HadronOrderbook = class _HadronOrderbook {
 import {
   getAssociatedTokenAddressSync as getAssociatedTokenAddressSync6,
   createAssociatedTokenAccountInstruction,
-  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID3
+  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID4
 } from "@solana/spl-token";
-async function getOrCreateAta(connection, mint, owner, payer, tokenProgram = TOKEN_PROGRAM_ID3, allowOwnerOffCurve = false) {
+async function getOrCreateAta(connection, mint, owner, payer, tokenProgram = TOKEN_PROGRAM_ID4, allowOwnerOffCurve = false) {
   const address = getAssociatedTokenAddressSync6(
     mint,
     owner,
@@ -2383,8 +2499,10 @@ export {
   buildApplyCurveUpdates,
   buildClosePool,
   buildDeposit,
+  buildFeeRecipientAtaIxs,
   buildInitialize,
   buildInitializeFeeConfig,
+  buildInitializePoolFeeConfig,
   buildInitializeSpreadConfig,
   buildNominateAuthority,
   buildRotateFeeAdmin,
@@ -2405,6 +2523,7 @@ export {
   buildUpdateFeeConfig,
   buildUpdateMidprice,
   buildUpdateMidpriceAndBaseSpread,
+  buildUpdatePoolFeeConfig,
   buildUpdateSpreadConfig,
   buildWithdraw,
   createWsolAtaInstruction,
@@ -2426,6 +2545,7 @@ export {
   getFeeConfigAddress,
   getMidpriceOracleAddress,
   getOrCreateAta,
+  getPoolFeeConfigAddress,
   getSpreadConfigAddress,
   isNativeMint,
   isSlotInitialized,
@@ -2433,7 +2553,7 @@ export {
   spreadBpsToQ32,
   spreadQ32ToBps,
   toQ32,
-  unwrapSolInstruction,
+  unwrapSolInstructions,
   wrapSolInstructions
 };
 //# sourceMappingURL=index.mjs.map