@t2000/sdk 2.13.2 → 2.14.1

package/dist/adapters/index.cjs

@@ -4303,26 +4303,6 @@ function resolveAssetInfo(asset) {
   }
   throw new T2000Error("ASSET_NOT_SUPPORTED", `Unknown asset: ${asset}`);
 }
-async function fetchCoins(client, owner, coinType) {
-  const all = [];
-  let cursor;
-  let hasNext = true;
-  while (hasNext) {
-    const page = await client.getCoins({ owner, coinType, cursor: cursor ?? void 0 });
-    all.push(...page.data.map((c) => ({ coinObjectId: c.coinObjectId, balance: c.balance })));
-    cursor = page.nextCursor;
-    hasNext = page.hasNextPage;
-  }
-  return all;
-}
-function mergeCoins(tx, coins) {
-  if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No coins to merge");
-  const primary = tx.object(coins[0].coinObjectId);
-  if (coins.length > 1) {
-    tx.mergeCoins(primary, coins.slice(1).map((c) => tx.object(c.coinObjectId)));
-  }
-  return primary;
-}
 async function getPositions(client, address) {
   try {
     const naviPositions = await $e(address, {
@@ -4413,13 +4393,15 @@ async function buildSaveTx(client, address, amount, options = {}) {
   }
   const asset = options.asset ?? "USDC";
   const assetInfo = resolveAssetInfo(asset);
-  const coins = await fetchCoins(client, address, assetInfo.type);
-  if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", `No ${assetInfo.displayName} coins found`);
-  const totalBalance = coins.reduce((sum, c) => sum + BigInt(c.balance), 0n);
+  const balResp = await client.getBalance({ owner: address, coinType: assetInfo.type });
+  const totalBalance = BigInt(balResp.totalBalance);
+  if (totalBalance === 0n) {
+    throw new T2000Error("INSUFFICIENT_BALANCE", `No ${assetInfo.displayName} balance found`);
+  }
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoins(tx, coins);
   const rawAmount = Math.min(Number(stableToRaw(amount, assetInfo.decimals)), Number(totalBalance));
+  const coinObj = transactions.coinWithBalance({ type: assetInfo.type, balance: BigInt(rawAmount) })(tx);
   try {
     await Ce(tx, assetInfo.type, coinObj, {
       ...sdkOptions(client),
@@ -4551,18 +4533,19 @@ async function buildRepayTx(client, address, amount, options = {}) {
   }
   const asset = options.asset ?? "USDC";
   const assetInfo = resolveAssetInfo(asset);
-  const coins = await fetchCoins(client, address, assetInfo.type);
-  if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", `No ${assetInfo.displayName} coins to repay with. Withdraw some savings first to get cash.`);
-  const totalBalance = coins.reduce((sum, c) => sum + BigInt(c.balance), 0n);
+  const balResp = await client.getBalance({ owner: address, coinType: assetInfo.type });
+  const totalBalance = BigInt(balResp.totalBalance);
+  if (totalBalance === 0n) {
+    throw new T2000Error("INSUFFICIENT_BALANCE", `No ${assetInfo.displayName} to repay with. Withdraw some savings first to get cash.`);
+  }
   const rawRequested = Number(stableToRaw(amount, assetInfo.decimals));
   if (Number(totalBalance) < rawRequested && Number(totalBalance) < 1e3) {
     throw new T2000Error("INSUFFICIENT_BALANCE", `Not enough ${assetInfo.displayName} to repay (need $${amount.toFixed(2)}, wallet has ~$${(Number(totalBalance) / 10 ** assetInfo.decimals).toFixed(4)}). Withdraw some savings first.`);
   }
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoins(tx, coins);
   const rawAmount = Math.min(rawRequested, Number(totalBalance));
-  const [repayCoin] = tx.splitCoins(coinObj, [rawAmount]);
+  const repayCoin = transactions.coinWithBalance({ type: assetInfo.type, balance: BigInt(rawAmount) })(tx);
   await refreshOracle(tx, client, address, {
     skipOracle: options.skipOracle,
     skipPythUpdate: options.skipPythUpdate