@whetstone-research/doppler-sdk 1.0.27 → 1.0.29

package/dist/{chunk-XTL2GBZ4.cjs → chunk-7PXLEMBJ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkU6B52TBT_cjs = require('./chunk-U6B52TBT.cjs');
+var chunk4CI2M2F6_cjs = require('./chunk-4CI2M2F6.cjs');
 var kit = require('@solana/kit');
 var programClientCore = require('@solana/program-client-core');
 
@@ -50,7 +50,7 @@ var ammConfigDataCodec = kit.getStructCodec([
   ["admin", addressCodec],
   ["paused", boolCodec],
   ["hookAllowlistLen", u8Codec],
-  ["hookAllowlist", kit.getArrayCodec(addressCodec, { size: chunkU6B52TBT_cjs.MAX_HOOK_ALLOWLIST })],
+  ["hookAllowlist", kit.getArrayCodec(addressCodec, { size: chunk4CI2M2F6_cjs.MAX_HOOK_ALLOWLIST })],
   ["maxSwapFeeBps", u16Codec],
   ["maxFeeSplitBps", u16Codec],
   ["protocolFeeEnabled", boolCodec],
@@ -113,22 +113,22 @@ var oracleStateDataCodec = kit.getStructCodec([
   ["observationIndex", u16Codec],
   [
     "observations",
-    kit.getArrayCodec(observationCodec, { size: chunkU6B52TBT_cjs.MAX_ORACLE_OBSERVATIONS })
+    kit.getArrayCodec(observationCodec, { size: chunk4CI2M2F6_cjs.MAX_ORACLE_OBSERVATIONS })
   ],
   ["version", u8Codec],
   ["reserved", reservedBytesCodec]
 ]);
 var ammConfigDecoder = kit.getHiddenPrefixDecoder(ammConfigDataCodec, [
-  kit.getConstantDecoder(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.AmmConfig)
+  kit.getConstantDecoder(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.AmmConfig)
 ]);
 var poolDecoder = kit.getHiddenPrefixDecoder(poolDataCodec, [
-  kit.getConstantDecoder(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Pool)
+  kit.getConstantDecoder(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.Pool)
 ]);
 var positionDecoder = kit.getHiddenPrefixDecoder(positionDataCodec, [
-  kit.getConstantDecoder(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position)
+  kit.getConstantDecoder(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.Position)
 ]);
 var oracleStateDecoder = kit.getHiddenPrefixDecoder(oracleStateDataCodec, [
-  kit.getConstantDecoder(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.OracleState)
+  kit.getConstantDecoder(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.OracleState)
 ]);
 function decodeAmmConfig(data) {
   return ammConfigDecoder.decode(data);
@@ -264,17 +264,96 @@ function encodeTransferAdminArgs(args) {
 function encodeOracleConsultArgs(args) {
   return new Uint8Array(oracleConsultArgsCodec.encode(args));
 }
+function isObject(value) {
+  return typeof value === "object" && value !== null;
+}
+function isTransactionSigner(value) {
+  return isObject(value) && "address" in value && "signTransactions" in value;
+}
+function getAddressFromAddressOrSigner(value) {
+  return isTransactionSigner(value) ? value.address : value;
+}
+function getAddressFromRemainingAccount(account) {
+  if (typeof account === "string") {
+    return account;
+  }
+  return account.address;
+}
+function createAccountMeta(value, role) {
+  if (isTransactionSigner(value)) {
+    return { address: value.address, role, signer: value };
+  }
+  return { address: value, role };
+}
+function createReadonlyRemainingAccountMeta(account) {
+  if (typeof account === "string") {
+    return { address: account, role: kit.AccountRole.READONLY };
+  }
+  if (isTransactionSigner(account)) {
+    return {
+      address: account.address,
+      role: kit.AccountRole.READONLY_SIGNER,
+      signer: account
+    };
+  }
+  return account;
+}
+function bytesToBase64(bytes) {
+  let binary = "";
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  return btoa(binary);
+}
+function bytesToBase64EncodedBytes(bytes) {
+  return bytesToBase64(bytes);
+}
+function base64ToBytes(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return bytes;
+}
+function addressToBase58EncodedBytes(address) {
+  return address;
+}
+function isEncodedProgramAccount(account) {
+  if (!isObject(account) || typeof account.pubkey !== "string") {
+    return false;
+  }
+  const accountData = account.account;
+  if (!isObject(accountData) || !Array.isArray(accountData.data)) {
+    return false;
+  }
+  const [encodedData, encoding] = accountData.data;
+  return typeof encodedData === "string" && encoding === "base64";
+}
+function normalizeProgramAccountsResponse(response) {
+  const accounts = Array.isArray(response) ? response : isObject(response) && Array.isArray(response.value) ? response.value : null;
+  if (!accounts) {
+    throw new Error("Unexpected getProgramAccounts response shape");
+  }
+  if (!accounts.every(isEncodedProgramAccount)) {
+    throw new Error("Unexpected getProgramAccounts account shape");
+  }
+  return accounts;
+}
+function warnAccountDecodeFailure(accountType, accountAddress) {
+  console.warn(`Failed to decode ${accountType} account: ${accountAddress}`);
+}
 
 // src/solana/core/math.ts
 function q64ToNumber(q64) {
   const intPart = q64 >> 64n;
   const fracPart = q64 & (1n << 64n) - 1n;
-  return Number(intPart) + Number(fracPart) / Number(chunkU6B52TBT_cjs.Q64_ONE);
+  return Number(intPart) + Number(fracPart) / Number(chunk4CI2M2F6_cjs.Q64_ONE);
 }
 function numberToQ64(n) {
   const intPart = Math.floor(n);
   const fracPart = n - intPart;
-  return (BigInt(intPart) << 64n) + BigInt(Math.round(fracPart * Number(chunkU6B52TBT_cjs.Q64_ONE)));
+  return (BigInt(intPart) << 64n) + BigInt(Math.round(fracPart * Number(chunk4CI2M2F6_cjs.Q64_ONE)));
 }
 function q64Mul(a, b) {
   return a * b >> 64n;
@@ -330,8 +409,8 @@ function getSwapQuote(pool, amountIn, tradeDirection) {
   if (reserveIn === 0n || reserveOut === 0n) {
     throw new Error("Pool has zero liquidity");
   }
-  const feeTotal = amountIn * BigInt(pool.swapFeeBps) / chunkU6B52TBT_cjs.BPS_DENOM;
-  const feeDist = feeTotal * BigInt(pool.feeSplitBps) / chunkU6B52TBT_cjs.BPS_DENOM;
+  const feeTotal = amountIn * BigInt(pool.swapFeeBps) / chunk4CI2M2F6_cjs.BPS_DENOM;
+  const feeDist = feeTotal * BigInt(pool.feeSplitBps) / chunk4CI2M2F6_cjs.BPS_DENOM;
   const feeComp = feeTotal - feeDist;
   const amountInEff = amountIn - feeTotal;
   const amountOut = amountInEff * reserveOut / (reserveIn + amountInEff);
@@ -357,8 +436,8 @@ function getSwapQuoteExactOut(pool, amountOut, tradeDirection) {
   }
   const amountInEff = ceilDiv(amountOut * reserveIn, reserveOut - amountOut);
   const amountIn = ceilDiv(
-    amountInEff * chunkU6B52TBT_cjs.BPS_DENOM,
-    chunkU6B52TBT_cjs.BPS_DENOM - BigInt(pool.swapFeeBps)
+    amountInEff * chunk4CI2M2F6_cjs.BPS_DENOM,
+    chunk4CI2M2F6_cjs.BPS_DENOM - BigInt(pool.swapFeeBps)
   );
   const feeTotal = amountIn - amountInEff;
   return { amountIn, feeTotal };
@@ -1620,6 +1699,298 @@ function parseInitializePoolInstruction(instruction) {
     data: getInitializePoolInstructionDataDecoder().decode(instruction.data)
   };
 }
+var INITIALIZE_SPOT_POOL_DISCRIMINATOR = new Uint8Array([
+  254,
+  243,
+  84,
+  29,
+  237,
+  165,
+  241,
+  217
+]);
+function getInitializeSpotPoolDiscriminatorBytes() {
+  return kit.fixEncoderSize(kit.getBytesEncoder(), 8).encode(
+    INITIALIZE_SPOT_POOL_DISCRIMINATOR
+  );
+}
+function getInitializeSpotPoolInstructionDataEncoder() {
+  return kit.transformEncoder(
+    kit.getStructEncoder([
+      ["discriminator", kit.fixEncoderSize(kit.getBytesEncoder(), 8)],
+      ["mintA", kit.getAddressEncoder()],
+      ["mintB", kit.getAddressEncoder()],
+      ["swapFeeBps", kit.getU16Encoder()]
+    ]),
+    (value) => ({
+      ...value,
+      discriminator: INITIALIZE_SPOT_POOL_DISCRIMINATOR
+    })
+  );
+}
+function getInitializeSpotPoolInstructionDataDecoder() {
+  return kit.getStructDecoder([
+    ["discriminator", kit.fixDecoderSize(kit.getBytesDecoder(), 8)],
+    ["mintA", kit.getAddressDecoder()],
+    ["mintB", kit.getAddressDecoder()],
+    ["swapFeeBps", kit.getU16Decoder()]
+  ]);
+}
+function getInitializeSpotPoolInstructionDataCodec() {
+  return kit.combineCodec(
+    getInitializeSpotPoolInstructionDataEncoder(),
+    getInitializeSpotPoolInstructionDataDecoder()
+  );
+}
+async function getInitializeSpotPoolInstructionAsync(input, config) {
+  const programAddress = config?.programAddress ?? CPMM_PROGRAM_ADDRESS;
+  const originalAccounts = {
+    config: { value: input.config ?? null, isWritable: false },
+    pool: { value: input.pool ?? null, isWritable: true },
+    protocolFeePosition: {
+      value: input.protocolFeePosition ?? null,
+      isWritable: true
+    },
+    protocolFeeOwner: {
+      value: input.protocolFeeOwner ?? null,
+      isWritable: false
+    },
+    authority: { value: input.authority ?? null, isWritable: false },
+    vault0: { value: input.vault0 ?? null, isWritable: true },
+    vault1: { value: input.vault1 ?? null, isWritable: true },
+    token0Mint: { value: input.token0Mint ?? null, isWritable: false },
+    token1Mint: { value: input.token1Mint ?? null, isWritable: false },
+    payer: { value: input.payer ?? null, isWritable: true },
+    token0Program: { value: input.token0Program ?? null, isWritable: false },
+    token1Program: { value: input.token1Program ?? null, isWritable: false },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    rent: { value: input.rent ?? null, isWritable: false },
+    migrationAuthority: {
+      value: input.migrationAuthority ?? null,
+      isWritable: false
+    }
+  };
+  const accounts = originalAccounts;
+  const args = { ...input };
+  if (!accounts.protocolFeeOwner.value) {
+    accounts.protocolFeeOwner.value = await kit.getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        kit.getBytesEncoder().encode(
+          new Uint8Array([
+            112,
+            114,
+            111,
+            116,
+            111,
+            99,
+            111,
+            108,
+            95,
+            102,
+            101,
+            101,
+            95,
+            111,
+            119,
+            110,
+            101,
+            114
+          ])
+        ),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount("pool", accounts.pool.value)
+        )
+      ]
+    });
+  }
+  if (!accounts.protocolFeePosition.value) {
+    accounts.protocolFeePosition.value = await kit.getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        kit.getBytesEncoder().encode(
+          new Uint8Array([112, 111, 115, 105, 116, 105, 111, 110])
+        ),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount("pool", accounts.pool.value)
+        ),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount(
+            "protocolFeeOwner",
+            accounts.protocolFeeOwner.value
+          )
+        ),
+        kit.getBytesEncoder().encode(new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0]))
+      ]
+    });
+  }
+  if (!accounts.authority.value) {
+    accounts.authority.value = await kit.getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        kit.getBytesEncoder().encode(
+          new Uint8Array([97, 117, 116, 104, 111, 114, 105, 116, 121])
+        ),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount("pool", accounts.pool.value)
+        )
+      ]
+    });
+  }
+  if (!accounts.vault0.value) {
+    accounts.vault0.value = await kit.getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        kit.getBytesEncoder().encode(new Uint8Array([118, 97, 117, 108, 116, 48])),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount("pool", accounts.pool.value)
+        )
+      ]
+    });
+  }
+  if (!accounts.vault1.value) {
+    accounts.vault1.value = await kit.getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        kit.getBytesEncoder().encode(new Uint8Array([118, 97, 117, 108, 116, 49])),
+        kit.getAddressEncoder().encode(
+          programClientCore.getAddressFromResolvedInstructionAccount("pool", accounts.pool.value)
+        )
+      ]
+    });
+  }
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value = "11111111111111111111111111111111";
+  }
+  if (!accounts.rent.value) {
+    accounts.rent.value = "SysvarRent111111111111111111111111111111111";
+  }
+  const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta("config", accounts.config),
+      getAccountMeta("pool", accounts.pool),
+      getAccountMeta("protocolFeePosition", accounts.protocolFeePosition),
+      getAccountMeta("protocolFeeOwner", accounts.protocolFeeOwner),
+      getAccountMeta("authority", accounts.authority),
+      getAccountMeta("vault0", accounts.vault0),
+      getAccountMeta("vault1", accounts.vault1),
+      getAccountMeta("token0Mint", accounts.token0Mint),
+      getAccountMeta("token1Mint", accounts.token1Mint),
+      getAccountMeta("payer", accounts.payer),
+      getAccountMeta("token0Program", accounts.token0Program),
+      getAccountMeta("token1Program", accounts.token1Program),
+      getAccountMeta("systemProgram", accounts.systemProgram),
+      getAccountMeta("rent", accounts.rent),
+      getAccountMeta("migrationAuthority", accounts.migrationAuthority)
+    ],
+    data: getInitializeSpotPoolInstructionDataEncoder().encode(
+      args
+    ),
+    programAddress
+  });
+}
+function getInitializeSpotPoolInstruction(input, config) {
+  const programAddress = config?.programAddress ?? CPMM_PROGRAM_ADDRESS;
+  const originalAccounts = {
+    config: { value: input.config ?? null, isWritable: false },
+    pool: { value: input.pool ?? null, isWritable: true },
+    protocolFeePosition: {
+      value: input.protocolFeePosition ?? null,
+      isWritable: true
+    },
+    protocolFeeOwner: {
+      value: input.protocolFeeOwner ?? null,
+      isWritable: false
+    },
+    authority: { value: input.authority ?? null, isWritable: false },
+    vault0: { value: input.vault0 ?? null, isWritable: true },
+    vault1: { value: input.vault1 ?? null, isWritable: true },
+    token0Mint: { value: input.token0Mint ?? null, isWritable: false },
+    token1Mint: { value: input.token1Mint ?? null, isWritable: false },
+    payer: { value: input.payer ?? null, isWritable: true },
+    token0Program: { value: input.token0Program ?? null, isWritable: false },
+    token1Program: { value: input.token1Program ?? null, isWritable: false },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    rent: { value: input.rent ?? null, isWritable: false },
+    migrationAuthority: {
+      value: input.migrationAuthority ?? null,
+      isWritable: false
+    }
+  };
+  const accounts = originalAccounts;
+  const args = { ...input };
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value = "11111111111111111111111111111111";
+  }
+  if (!accounts.rent.value) {
+    accounts.rent.value = "SysvarRent111111111111111111111111111111111";
+  }
+  const getAccountMeta = programClientCore.getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta("config", accounts.config),
+      getAccountMeta("pool", accounts.pool),
+      getAccountMeta("protocolFeePosition", accounts.protocolFeePosition),
+      getAccountMeta("protocolFeeOwner", accounts.protocolFeeOwner),
+      getAccountMeta("authority", accounts.authority),
+      getAccountMeta("vault0", accounts.vault0),
+      getAccountMeta("vault1", accounts.vault1),
+      getAccountMeta("token0Mint", accounts.token0Mint),
+      getAccountMeta("token1Mint", accounts.token1Mint),
+      getAccountMeta("payer", accounts.payer),
+      getAccountMeta("token0Program", accounts.token0Program),
+      getAccountMeta("token1Program", accounts.token1Program),
+      getAccountMeta("systemProgram", accounts.systemProgram),
+      getAccountMeta("rent", accounts.rent),
+      getAccountMeta("migrationAuthority", accounts.migrationAuthority)
+    ],
+    data: getInitializeSpotPoolInstructionDataEncoder().encode(
+      args
+    ),
+    programAddress
+  });
+}
+function parseInitializeSpotPoolInstruction(instruction) {
+  if (instruction.accounts.length < 15) {
+    throw new kit.SolanaError(
+      kit.SOLANA_ERROR__PROGRAM_CLIENTS__INSUFFICIENT_ACCOUNT_METAS,
+      {
+        actualAccountMetas: instruction.accounts.length,
+        expectedAccountMetas: 15
+      }
+    );
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = instruction.accounts[accountIndex];
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      config: getNextAccount(),
+      pool: getNextAccount(),
+      protocolFeePosition: getNextAccount(),
+      protocolFeeOwner: getNextAccount(),
+      authority: getNextAccount(),
+      vault0: getNextAccount(),
+      vault1: getNextAccount(),
+      token0Mint: getNextAccount(),
+      token1Mint: getNextAccount(),
+      payer: getNextAccount(),
+      token0Program: getNextAccount(),
+      token1Program: getNextAccount(),
+      systemProgram: getNextAccount(),
+      rent: getNextAccount(),
+      migrationAuthority: getNextAccount()
+    },
+    data: getInitializeSpotPoolInstructionDataDecoder().decode(
+      instruction.data
+    )
+  };
+}
 var ORACLE_CONSULT_DISCRIMINATOR = new Uint8Array([
   239,
   237,
@@ -3352,21 +3723,6 @@ function parseAddLiquidityInstruction(instruction) {
 }
 
 // src/solana/client/pool.ts
-function bytesToBase64(bytes) {
-  let binary = "";
-  for (let i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-  return btoa(binary);
-}
-function base64ToBytes(base64) {
-  const binary = atob(base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
 async function fetchPool(rpc, address, config) {
   const response = await rpc.getAccountInfo(address, {
     encoding: "base64",
@@ -3378,11 +3734,11 @@ async function fetchPool(rpc, address, config) {
   return decodePool(base64ToBytes(response.value.data[0]));
 }
 async function fetchAllPools(rpc, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
-      bytes: bytesToBase64(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Pool),
+      bytes: bytesToBase64EncodedBytes(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.Pool),
       encoding: "base64"
     }
   };
@@ -3391,7 +3747,7 @@ async function fetchAllPools(rpc, config) {
     commitment: config?.commitment,
     filters: [discriminatorFilter]
   }).send();
-  const accounts = Array.isArray(response) ? response : response.value;
+  const accounts = normalizeProgramAccountsResponse(response);
   const pools = [];
   for (const account of accounts) {
     try {
@@ -3401,14 +3757,14 @@ async function fetchAllPools(rpc, config) {
         account: pool
       });
     } catch {
-      console.warn(`Failed to decode pool account: ${account.pubkey}`);
+      warnAccountDecodeFailure("pool", account.pubkey);
     }
   }
   return pools;
 }
 async function getPoolByMints(rpc, mint0, mint1, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
-  const [poolAddress] = await chunkU6B52TBT_cjs.getPoolAddress(mint0, mint1, programId);
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
+  const [poolAddress] = await chunk4CI2M2F6_cjs.getPoolAddress(mint0, mint1, programId);
   const pool = await fetchPool(rpc, poolAddress, config);
   if (!pool) {
     return null;
@@ -3435,9 +3791,9 @@ async function poolExists(rpc, mint0, mint1, config) {
   const result = await getPoolByMints(rpc, mint0, mint1, config);
   return result !== null;
 }
-async function getPoolAddressFromMints(mint0, mint1, programId = chunkU6B52TBT_cjs.CPMM_PROGRAM_ID) {
-  const [token0, token1] = chunkU6B52TBT_cjs.sortMints(mint0, mint1);
-  const [poolAddress] = await chunkU6B52TBT_cjs.getPoolAddress(mint0, mint1, programId);
+async function getPoolAddressFromMints(mint0, mint1, programId = chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID) {
+  const [token0, token1] = chunk4CI2M2F6_cjs.sortMints(mint0, mint1);
+  const [poolAddress] = await chunk4CI2M2F6_cjs.getPoolAddress(mint0, mint1, programId);
   return {
     poolAddress,
     token0,
@@ -3459,21 +3815,6 @@ function sortPoolsByReserves(pools, descending = true) {
 }
 
 // src/solana/client/position.ts
-function bytesToBase642(bytes) {
-  let binary = "";
-  for (let i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-  return btoa(binary);
-}
-function base64ToBytes2(base64) {
-  const binary = atob(base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
 async function fetchPosition(rpc, address, config) {
   const response = await rpc.getAccountInfo(address, {
     encoding: "base64",
@@ -3482,18 +3823,16 @@ async function fetchPosition(rpc, address, config) {
   if (!response.value) {
     return null;
   }
-  return decodePosition(base64ToBytes2(response.value.data[0]));
+  return decodePosition(base64ToBytes(response.value.data[0]));
 }
 async function fetchUserPositions(rpc, owner, pool, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
   const filters = [
     // Discriminator filter (first 8 bytes)
     {
       memcmp: {
         offset: 0n,
-        bytes: bytesToBase642(
-          chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position
-        ),
+        bytes: bytesToBase64EncodedBytes(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.Position),
         encoding: "base64"
       }
     },
@@ -3501,7 +3840,7 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     {
       memcmp: {
         offset: 40n,
-        bytes: owner,
+        bytes: addressToBase58EncodedBytes(owner),
         encoding: "base58"
       }
     }
@@ -3510,7 +3849,7 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     filters.push({
       memcmp: {
         offset: 8n,
-        bytes: pool,
+        bytes: addressToBase58EncodedBytes(pool),
         encoding: "base58"
       }
     });
@@ -3520,31 +3859,29 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     commitment: config?.commitment,
     filters
   }).send();
-  const accounts = Array.isArray(response) ? response : response.value;
+  const accounts = normalizeProgramAccountsResponse(response);
   const positions = [];
   for (const account of accounts) {
     try {
-      const position = decodePosition(base64ToBytes2(account.account.data[0]));
+      const position = decodePosition(base64ToBytes(account.account.data[0]));
       positions.push({
         address: account.pubkey,
         account: position
       });
     } catch {
-      console.warn(`Failed to decode position account: ${account.pubkey}`);
+      warnAccountDecodeFailure("position", account.pubkey);
     }
   }
   return positions;
 }
 async function fetchPoolPositions(rpc, pool, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
   const filters = [
     // Discriminator filter
     {
       memcmp: {
         offset: 0n,
-        bytes: bytesToBase642(
-          chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position
-        ),
+        bytes: bytesToBase64EncodedBytes(chunk4CI2M2F6_cjs.ACCOUNT_DISCRIMINATORS.Position),
         encoding: "base64"
       }
     },
@@ -3552,7 +3889,7 @@ async function fetchPoolPositions(rpc, pool, config) {
     {
       memcmp: {
         offset: 8n,
-        bytes: pool,
+        bytes: addressToBase58EncodedBytes(pool),
         encoding: "base58"
       }
     }
@@ -3562,17 +3899,17 @@ async function fetchPoolPositions(rpc, pool, config) {
     commitment: config?.commitment,
     filters
   }).send();
-  const accounts = Array.isArray(response) ? response : response.value;
+  const accounts = normalizeProgramAccountsResponse(response);
   const positions = [];
   for (const account of accounts) {
     try {
-      const position = decodePosition(base64ToBytes2(account.account.data[0]));
+      const position = decodePosition(base64ToBytes(account.account.data[0]));
       positions.push({
         address: account.pubkey,
         account: position
       });
     } catch {
-      console.warn(`Failed to decode position account: ${account.pubkey}`);
+      warnAccountDecodeFailure("position", account.pubkey);
     }
   }
   return positions;
@@ -3604,8 +3941,8 @@ function getPositionValue(pool, position) {
   };
 }
 async function fetchPositionByParams(rpc, pool, owner, positionId, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
-  const [address] = await chunkU6B52TBT_cjs.getPositionAddress(
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
+  const [address] = await chunk4CI2M2F6_cjs.getPositionAddress(
     pool,
     owner,
     positionId,
@@ -3620,8 +3957,8 @@ async function fetchPositionByParams(rpc, pool, owner, positionId, config) {
     account: position
   };
 }
-async function getPositionAddressFromParams(pool, owner, positionId, programId = chunkU6B52TBT_cjs.CPMM_PROGRAM_ID) {
-  const [address] = await chunkU6B52TBT_cjs.getPositionAddress(
+async function getPositionAddressFromParams(pool, owner, positionId, programId = chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID) {
+  const [address] = await chunk4CI2M2F6_cjs.getPositionAddress(
     pool,
     owner,
     positionId,
@@ -3653,14 +3990,6 @@ function sortPositionsByShares(positions, descending = true) {
 }
 
 // src/solana/client/oracle.ts
-function base64ToBytes3(base64) {
-  const binary = atob(base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
 async function fetchOracle(rpc, address, config) {
   const response = await rpc.getAccountInfo(address, {
     encoding: "base64",
@@ -3669,11 +3998,11 @@ async function fetchOracle(rpc, address, config) {
   if (!response.value) {
     return null;
   }
-  return decodeOracleState(base64ToBytes3(response.value.data[0]));
+  return decodeOracleState(base64ToBytes(response.value.data[0]));
 }
 async function getOracleForPool(rpc, pool, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
-  const [oracleAddress] = await chunkU6B52TBT_cjs.getOracleAddress(pool, programId);
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
+  const [oracleAddress] = await chunk4CI2M2F6_cjs.getOracleAddress(pool, programId);
   const oracle = await fetchOracle(rpc, oracleAddress, config);
   if (!oracle) {
     return null;
@@ -3683,8 +4012,8 @@ async function getOracleForPool(rpc, pool, config) {
     account: oracle
   };
 }
-async function getOracleAddressFromPool(pool, programId = chunkU6B52TBT_cjs.CPMM_PROGRAM_ID) {
-  const [address] = await chunkU6B52TBT_cjs.getOracleAddress(pool, programId);
+async function getOracleAddressFromPool(pool, programId = chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID) {
+  const [address] = await chunk4CI2M2F6_cjs.getOracleAddress(pool, programId);
   return address;
 }
 function consultTwap(oracle, windowSeconds, currentTimestamp) {
@@ -3807,10 +4136,10 @@ function getOracleBufferStats(oracle) {
   };
 }
 async function fetchOraclesBatch(rpc, pools, config) {
-  const programId = config?.programId ?? chunkU6B52TBT_cjs.CPMM_PROGRAM_ID;
+  const programId = config?.programId ?? chunk4CI2M2F6_cjs.CPMM_PROGRAM_ID;
   const oracles = /* @__PURE__ */ new Map();
   const oracleAddresses = await Promise.all(
-    pools.map((pool) => chunkU6B52TBT_cjs.getOracleAddress(pool, programId))
+    pools.map((pool) => chunk4CI2M2F6_cjs.getOracleAddress(pool, programId))
   );
   const results = await Promise.all(
     oracleAddresses.map(([addr]) => fetchOracle(rpc, addr, config))
@@ -3846,6 +4175,7 @@ exports.CREATE_POSITION_DISCRIMINATOR = CREATE_POSITION_DISCRIMINATOR;
 exports.INITIALIZE_CONFIG_DISCRIMINATOR = INITIALIZE_CONFIG_DISCRIMINATOR;
 exports.INITIALIZE_ORACLE_DISCRIMINATOR = INITIALIZE_ORACLE_DISCRIMINATOR;
 exports.INITIALIZE_POOL_DISCRIMINATOR = INITIALIZE_POOL_DISCRIMINATOR;
+exports.INITIALIZE_SPOT_POOL_DISCRIMINATOR = INITIALIZE_SPOT_POOL_DISCRIMINATOR;
 exports.ORACLE_CONSULT_DISCRIMINATOR = ORACLE_CONSULT_DISCRIMINATOR;
 exports.ORACLE_UPDATE_DISCRIMINATOR = ORACLE_UPDATE_DISCRIMINATOR;
 exports.PAUSE_DISCRIMINATOR = PAUSE_DISCRIMINATOR;
@@ -3860,7 +4190,11 @@ exports.UNPAUSE_DISCRIMINATOR = UNPAUSE_DISCRIMINATOR;
 exports.UPDATE_CONFIG_DISCRIMINATOR = UPDATE_CONFIG_DISCRIMINATOR;
 exports.WITHDRAW_VAULT_EXCESS_DISCRIMINATOR = WITHDRAW_VAULT_EXCESS_DISCRIMINATOR;
 exports.addLiquidityArgsCodec = addLiquidityArgsCodec;
+exports.addressToBase58EncodedBytes = addressToBase58EncodedBytes;
 exports.ammConfigDataCodec = ammConfigDataCodec;
+exports.base64ToBytes = base64ToBytes;
+exports.bytesToBase64 = bytesToBase64;
+exports.bytesToBase64EncodedBytes = bytesToBase64EncodedBytes;
 exports.calculateAccruedFees = calculateAccruedFees;
 exports.calculateTwap = calculateTwap;
 exports.calculateTwapNumber = calculateTwapNumber;
@@ -3871,7 +4205,9 @@ exports.comparePoolAndOraclePrices = comparePoolAndOraclePrices;
 exports.computePrice0Q64 = computePrice0Q64;
 exports.computePrice1Q64 = computePrice1Q64;
 exports.consultTwap = consultTwap;
+exports.createAccountMeta = createAccountMeta;
 exports.createPositionArgsCodec = createPositionArgsCodec;
+exports.createReadonlyRemainingAccountMeta = createReadonlyRemainingAccountMeta;
 exports.decodeAmmConfig = decodeAmmConfig;
 exports.decodeOracleState = decodeOracleState;
 exports.decodePool = decodePool;
@@ -3909,6 +4245,8 @@ exports.getAddLiquidityInstructionDataCodec = getAddLiquidityInstructionDataCode
 exports.getAddLiquidityInstructionDataDecoder = getAddLiquidityInstructionDataDecoder;
 exports.getAddLiquidityInstructionDataEncoder = getAddLiquidityInstructionDataEncoder;
 exports.getAddLiquidityQuote = getAddLiquidityQuote;
+exports.getAddressFromAddressOrSigner = getAddressFromAddressOrSigner;
+exports.getAddressFromRemainingAccount = getAddressFromRemainingAccount;
 exports.getClosePositionDiscriminatorBytes = getClosePositionDiscriminatorBytes;
 exports.getClosePositionInstruction = getClosePositionInstruction;
 exports.getClosePositionInstructionDataCodec = getClosePositionInstructionDataCodec;
@@ -3950,6 +4288,12 @@ exports.getInitializePoolInstructionAsync = getInitializePoolInstructionAsync;
 exports.getInitializePoolInstructionDataCodec = getInitializePoolInstructionDataCodec;
 exports.getInitializePoolInstructionDataDecoder = getInitializePoolInstructionDataDecoder;
 exports.getInitializePoolInstructionDataEncoder = getInitializePoolInstructionDataEncoder;
+exports.getInitializeSpotPoolDiscriminatorBytes = getInitializeSpotPoolDiscriminatorBytes;
+exports.getInitializeSpotPoolInstruction = getInitializeSpotPoolInstruction;
+exports.getInitializeSpotPoolInstructionAsync = getInitializeSpotPoolInstructionAsync;
+exports.getInitializeSpotPoolInstructionDataCodec = getInitializeSpotPoolInstructionDataCodec;
+exports.getInitializeSpotPoolInstructionDataDecoder = getInitializeSpotPoolInstructionDataDecoder;
+exports.getInitializeSpotPoolInstructionDataEncoder = getInitializeSpotPoolInstructionDataEncoder;
 exports.getK = getK;
 exports.getOracleAddressFromPool = getOracleAddressFromPool;
 exports.getOracleAge = getOracleAge;
@@ -4043,9 +4387,11 @@ exports.initializeConfigArgsCodec = initializeConfigArgsCodec;
 exports.initializeOracleArgsCodec = initializeOracleArgsCodec;
 exports.initializePoolArgsCodec = initializePoolArgsCodec;
 exports.isOracleStale = isOracleStale;
+exports.isTransactionSigner = isTransactionSigner;
 exports.isqrt = isqrt;
 exports.maxBigInt = maxBigInt;
 exports.minBigInt = minBigInt;
+exports.normalizeProgramAccountsResponse = normalizeProgramAccountsResponse;
 exports.numberToQ64 = numberToQ64;
 exports.observationCodec = observationCodec;
 exports.oracleConsultArgsCodec = oracleConsultArgsCodec;
@@ -4058,6 +4404,7 @@ exports.parseCreatePositionInstruction = parseCreatePositionInstruction;
 exports.parseInitializeConfigInstruction = parseInitializeConfigInstruction;
 exports.parseInitializeOracleInstruction = parseInitializeOracleInstruction;
 exports.parseInitializePoolInstruction = parseInitializePoolInstruction;
+exports.parseInitializeSpotPoolInstruction = parseInitializeSpotPoolInstruction;
 exports.parseOracleConsultInstruction = parseOracleConsultInstruction;
 exports.parseOracleUpdateInstruction = parseOracleUpdateInstruction;
 exports.parsePauseInstruction = parsePauseInstruction;
@@ -4085,5 +4432,6 @@ exports.sortPoolsByReserves = sortPoolsByReserves;
 exports.sortPositionsByShares = sortPositionsByShares;
 exports.swapExactInArgsCodec = swapExactInArgsCodec;
 exports.transferAdminArgsCodec = transferAdminArgsCodec;
-//# sourceMappingURL=chunk-XTL2GBZ4.cjs.map
-//# sourceMappingURL=chunk-XTL2GBZ4.cjs.map
+exports.warnAccountDecodeFailure = warnAccountDecodeFailure;
+//# sourceMappingURL=chunk-7PXLEMBJ.cjs.map
+//# sourceMappingURL=chunk-7PXLEMBJ.cjs.map