@t2000/sdk 1.10.1 → 1.11.1

package/dist/index.d.cts

@@ -271,8 +271,9 @@ declare function addSendToTx(tx: Transaction, coin: TransactionObjectArgument, r
  * given coin type.
  *
  * Replaces three earlier inline implementations:
- * - `cetus-swap.ts:fetchAllCoinsForSwap` (kept for backwards-compat,
- *   delegates here)
+ * - `cetus-swap.ts:fetchAllCoinsForSwap` (deleted 2026-05-02 — addSwapToTx
+ *   now calls `selectAndSplitCoin` directly so the merge cache is shared
+ *   across every appender in a multi-write bundle)
  * - `volo.ts:fetchCoinsByType` (kept for backwards-compat, delegates
  *   here)
  * - audric host's `transactions/prepare/route.ts:fetchCoinsForSwap`
@@ -281,7 +282,10 @@ declare function addSendToTx(tx: Transaction, coin: TransactionObjectArgument, r
  * Single source of truth for the "fetch coins of type X owned by
  * address Y, paginated" pattern. P2.2b extracts this so `composeTx`'s
  * registry adapters can build a wallet-mode `TransactionObjectArgument`
- * uniformly across save / send / repay / etc.
+ * uniformly across save / send / repay / etc. The 2026-05-02 P2.7 fix
+ * adds a per-PTB merge cache so multi-write bundles that touch the same
+ * coin type twice (swap+save, save+send, etc.) only emit `mergeCoins`
+ * once — see `ptbMergeCache` JSDoc below.
  */
 
 interface CoinPage {

package/dist/index.d.ts

@@ -271,8 +271,9 @@ declare function addSendToTx(tx: Transaction, coin: TransactionObjectArgument, r
  * given coin type.
  *
  * Replaces three earlier inline implementations:
- * - `cetus-swap.ts:fetchAllCoinsForSwap` (kept for backwards-compat,
- *   delegates here)
+ * - `cetus-swap.ts:fetchAllCoinsForSwap` (deleted 2026-05-02 — addSwapToTx
+ *   now calls `selectAndSplitCoin` directly so the merge cache is shared
+ *   across every appender in a multi-write bundle)
  * - `volo.ts:fetchCoinsByType` (kept for backwards-compat, delegates
  *   here)
  * - audric host's `transactions/prepare/route.ts:fetchCoinsForSwap`
@@ -281,7 +282,10 @@ declare function addSendToTx(tx: Transaction, coin: TransactionObjectArgument, r
  * Single source of truth for the "fetch coins of type X owned by
  * address Y, paginated" pattern. P2.2b extracts this so `composeTx`'s
  * registry adapters can build a wallet-mode `TransactionObjectArgument`
- * uniformly across save / send / repay / etc.
+ * uniformly across save / send / repay / etc. The 2026-05-02 P2.7 fix
+ * adds a per-PTB merge cache so multi-write bundles that touch the same
+ * coin type twice (swap+save, save+send, etc.) only emit `mergeCoins`
+ * once — see `ptbMergeCache` JSDoc below.
  */
 
 interface CoinPage {

package/dist/index.js

@@ -818,6 +818,97 @@ var init_volo = __esm({
   }
 });
 
+// src/wallet/coinSelection.ts
+var coinSelection_exports = {};
+__export(coinSelection_exports, {
+  fetchAllCoins: () => fetchAllCoins,
+  selectAndSplitCoin: () => selectAndSplitCoin,
+  selectSuiCoin: () => selectSuiCoin
+});
+function getMergeCache(tx) {
+  let cache = ptbMergeCache.get(tx);
+  if (!cache) {
+    cache = /* @__PURE__ */ new Map();
+    ptbMergeCache.set(tx, cache);
+  }
+  return cache;
+}
+async function fetchAllCoins(client, owner, coinType) {
+  const ids = [];
+  let totalBalance = 0n;
+  let cursor;
+  let hasNext = true;
+  while (hasNext) {
+    const page = await client.getCoins({ owner, coinType, cursor: cursor ?? void 0 });
+    for (const c of page.data) {
+      ids.push(c.coinObjectId);
+      totalBalance += BigInt(c.balance);
+    }
+    cursor = page.nextCursor;
+    hasNext = page.hasNextPage;
+  }
+  return { ids, totalBalance };
+}
+async function selectAndSplitCoin(tx, client, owner, coinType, amount, options = {}) {
+  const cache = getMergeCache(tx);
+  const cacheKey = `${owner}|${coinType}`;
+  const cached = cache.get(cacheKey);
+  if (cached) {
+    const allowSwapAll2 = options.allowSwapAll ?? true;
+    if (amount !== "all" && amount > cached.remaining && !allowSwapAll2) {
+      throw new T2000Error("INSUFFICIENT_BALANCE", `Insufficient balance for ${coinType}`, {
+        available: cached.remaining.toString(),
+        required: amount.toString()
+      });
+    }
+    const requested2 = amount === "all" ? cached.remaining : amount;
+    const swapAll2 = amount === "all" || requested2 >= cached.remaining;
+    const effectiveAmount2 = swapAll2 ? cached.remaining : requested2;
+    const coin2 = swapAll2 ? cached.primary : tx.splitCoins(cached.primary, [effectiveAmount2])[0];
+    cached.remaining = swapAll2 ? 0n : cached.remaining - effectiveAmount2;
+    return { coin: coin2, effectiveAmount: effectiveAmount2, swapAll: swapAll2 };
+  }
+  const { ids, totalBalance } = await fetchAllCoins(client, owner, coinType);
+  if (ids.length === 0) {
+    throw new T2000Error("INSUFFICIENT_BALANCE", `No coins found for ${coinType}`);
+  }
+  const allowSwapAll = options.allowSwapAll ?? true;
+  if (amount !== "all" && amount > totalBalance && !allowSwapAll) {
+    throw new T2000Error("INSUFFICIENT_BALANCE", `Insufficient balance for ${coinType}`, {
+      available: totalBalance.toString(),
+      required: amount.toString()
+    });
+  }
+  const requested = amount === "all" ? totalBalance : amount;
+  const swapAll = amount === "all" || requested >= totalBalance;
+  const effectiveAmount = swapAll ? totalBalance : requested;
+  const primary = tx.object(ids[0]);
+  if (ids.length > 1) {
+    tx.mergeCoins(primary, ids.slice(1).map((id) => tx.object(id)));
+  }
+  const coin = swapAll ? primary : tx.splitCoins(primary, [effectiveAmount])[0];
+  cache.set(cacheKey, {
+    primary,
+    remaining: swapAll ? 0n : totalBalance - effectiveAmount
+  });
+  return { coin, effectiveAmount, swapAll };
+}
+async function selectSuiCoin(tx, client, owner, amountMist, sponsoredContext) {
+  if (sponsoredContext) {
+    const { SUI_TYPE: SUI_TYPE2 } = await Promise.resolve().then(() => (init_token_registry(), token_registry_exports));
+    return selectAndSplitCoin(tx, client, owner, SUI_TYPE2, amountMist);
+  }
+  const [coin] = tx.splitCoins(tx.gas, [amountMist]);
+  return { coin, effectiveAmount: amountMist, swapAll: false };
+}
+var ptbMergeCache;
+var init_coinSelection = __esm({
+  "src/wallet/coinSelection.ts"() {
+    init_errors();
+    ptbMergeCache = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // src/protocols/cetus-swap.ts
 var cetus_swap_exports = {};
 __export(cetus_swap_exports, {
@@ -913,17 +1004,10 @@ async function addSwapToTx(tx, client, address, input) {
     inputCoin = input.inputCoin;
     effectiveRaw = requestedRaw;
   } else {
-    const { ids, totalBalance } = await fetchAllCoinsForSwap(client, address, fromType);
-    if (ids.length === 0) {
-      throw new T2000Error2("INSUFFICIENT_BALANCE", `No ${input.from} coins found in wallet`);
-    }
-    const swapAll = requestedRaw >= totalBalance;
-    effectiveRaw = swapAll ? totalBalance : requestedRaw;
-    const primary = tx.object(ids[0]);
-    if (ids.length > 1) {
-      tx.mergeCoins(primary, ids.slice(1).map((id) => tx.object(id)));
-    }
-    inputCoin = swapAll ? primary : tx.splitCoins(primary, [effectiveRaw])[0];
+    const { selectAndSplitCoin: selectAndSplitCoin2 } = await Promise.resolve().then(() => (init_coinSelection(), coinSelection_exports));
+    const result = await selectAndSplitCoin2(tx, client, address, fromType, requestedRaw);
+    inputCoin = result.coin;
+    effectiveRaw = result.effectiveAmount;
   }
   const route = await findSwapRoute({
     walletAddress: address,
@@ -955,22 +1039,6 @@ async function addSwapToTx(tx, client, address, input) {
     route
   };
 }
-async function fetchAllCoinsForSwap(client, owner, coinType) {
-  const ids = [];
-  let totalBalance = 0n;
-  let cursor;
-  let hasNext = true;
-  while (hasNext) {
-    const page = await client.getCoins({ owner, coinType, cursor: cursor ?? void 0 });
-    for (const c of page.data) {
-      ids.push(c.coinObjectId);
-      totalBalance += BigInt(c.balance);
-    }
-    cursor = page.nextCursor;
-    hasNext = page.hasNextPage;
-  }
-  return { ids, totalBalance };
-}
 async function simulateSwap(params) {
   const client = getClient(params.walletAddress, params.overlayFee);
   try {
@@ -7378,57 +7446,10 @@ var T2000 = class _T2000 extends EventEmitter {
 
 // src/index.ts
 init_errors();
-
-// src/wallet/coinSelection.ts
-init_errors();
-async function fetchAllCoins(client, owner, coinType) {
-  const ids = [];
-  let totalBalance = 0n;
-  let cursor;
-  let hasNext = true;
-  while (hasNext) {
-    const page = await client.getCoins({ owner, coinType, cursor: cursor ?? void 0 });
-    for (const c of page.data) {
-      ids.push(c.coinObjectId);
-      totalBalance += BigInt(c.balance);
-    }
-    cursor = page.nextCursor;
-    hasNext = page.hasNextPage;
-  }
-  return { ids, totalBalance };
-}
-async function selectAndSplitCoin(tx, client, owner, coinType, amount, options = {}) {
-  const { ids, totalBalance } = await fetchAllCoins(client, owner, coinType);
-  if (ids.length === 0) {
-    throw new T2000Error("INSUFFICIENT_BALANCE", `No coins found for ${coinType}`);
-  }
-  const allowSwapAll = options.allowSwapAll ?? true;
-  if (amount !== "all" && amount > totalBalance && !allowSwapAll) {
-    throw new T2000Error("INSUFFICIENT_BALANCE", `Insufficient balance for ${coinType}`, {
-      available: totalBalance.toString(),
-      required: amount.toString()
-    });
-  }
-  const requested = amount === "all" ? totalBalance : amount;
-  const swapAll = amount === "all" || requested >= totalBalance;
-  const effectiveAmount = swapAll ? totalBalance : requested;
-  const primary = tx.object(ids[0]);
-  if (ids.length > 1) {
-    tx.mergeCoins(primary, ids.slice(1).map((id) => tx.object(id)));
-  }
-  const coin = swapAll ? primary : tx.splitCoins(primary, [effectiveAmount])[0];
-  return { coin, effectiveAmount, swapAll };
-}
-async function selectSuiCoin(tx, client, owner, amountMist, sponsoredContext) {
-  if (sponsoredContext) {
-    const { SUI_TYPE: SUI_TYPE2 } = await Promise.resolve().then(() => (init_token_registry(), token_registry_exports));
-    return selectAndSplitCoin(tx, client, owner, SUI_TYPE2, amountMist);
-  }
-  const [coin] = tx.splitCoins(tx.gas, [amountMist]);
-  return { coin, effectiveAmount: amountMist, swapAll: false };
-}
+init_coinSelection();
 init_cetus_swap();
 init_volo();
+init_coinSelection();
 init_token_registry();
 init_errors();
 var SPONSORED_PYTH_DEPENDENT_PROVIDERS = [