@whetstone-research/doppler-sdk 1.0.27 → 1.0.28

package/dist/{chunk-XTL2GBZ4.cjs → chunk-4WY5GNZD.cjs}

@@ -264,6 +264,85 @@ 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) {
@@ -3352,21 +3431,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",
@@ -3382,7 +3446,7 @@ async function fetchAllPools(rpc, config) {
   const discriminatorFilter = {
     memcmp: {
       offset: 0n,
-      bytes: bytesToBase64(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Pool),
+      bytes: bytesToBase64EncodedBytes(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Pool),
       encoding: "base64"
     }
   };
@@ -3391,7 +3455,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,7 +3465,7 @@ async function fetchAllPools(rpc, config) {
         account: pool
       });
     } catch {
-      console.warn(`Failed to decode pool account: ${account.pubkey}`);
+      warnAccountDecodeFailure("pool", account.pubkey);
     }
   }
   return pools;
@@ -3459,21 +3523,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,7 +3531,7 @@ 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;
@@ -3491,9 +3540,7 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     {
       memcmp: {
         offset: 0n,
-        bytes: bytesToBase642(
-          chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position
-        ),
+        bytes: bytesToBase64EncodedBytes(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position),
         encoding: "base64"
       }
     },
@@ -3501,7 +3548,7 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     {
       memcmp: {
         offset: 40n,
-        bytes: owner,
+        bytes: addressToBase58EncodedBytes(owner),
         encoding: "base58"
       }
     }
@@ -3510,7 +3557,7 @@ async function fetchUserPositions(rpc, owner, pool, config) {
     filters.push({
       memcmp: {
         offset: 8n,
-        bytes: pool,
+        bytes: addressToBase58EncodedBytes(pool),
         encoding: "base58"
       }
     });
@@ -3520,17 +3567,17 @@ 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;
@@ -3542,9 +3589,7 @@ async function fetchPoolPositions(rpc, pool, config) {
     {
       memcmp: {
         offset: 0n,
-        bytes: bytesToBase642(
-          chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position
-        ),
+        bytes: bytesToBase64EncodedBytes(chunkU6B52TBT_cjs.ACCOUNT_DISCRIMINATORS.Position),
         encoding: "base64"
       }
     },
@@ -3552,7 +3597,7 @@ async function fetchPoolPositions(rpc, pool, config) {
     {
       memcmp: {
         offset: 8n,
-        bytes: pool,
+        bytes: addressToBase58EncodedBytes(pool),
         encoding: "base58"
       }
     }
@@ -3562,17 +3607,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;
@@ -3653,14 +3698,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,7 +3706,7 @@ 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;
@@ -3860,7 +3897,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 +3912,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 +3952,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;
@@ -4043,9 +4088,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;
@@ -4085,5 +4132,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-4WY5GNZD.cjs.map
+//# sourceMappingURL=chunk-4WY5GNZD.cjs.map