@clonegod/ttd-sui-common 2.0.11 → 2.0.13

package/dist/trade/executor/central_executor.js

@@ -49,6 +49,7 @@ class CentralExecutor {
         this.tradeCoinTypesProvider = opts.tradeCoinTypes;
         this.tradePoolsProvider = opts.tradePools;
         this.cache.setAmountFormatter((ct, raw) => this.fmtAmount(ct, raw));
+        this.decimalsCache.set(constants_1.SUI_TOKEN_ADDRESS.LONG, 9);
     }
     async init() {
         const tradeIds = (process.env.SUI_WALLET_GROUP_IDS || '').split(',').map(s => s.trim()).filter(Boolean);
@@ -117,6 +118,9 @@ class CentralExecutor {
     }
     async reconcileCoins(wallet, coinType, quietIfUnchanged = false) {
         try {
+            const abP = this.core.getBalance({ owner: wallet, coinType })
+                .then(b => this.cache.setAddressBalance(wallet, coinType, BigInt(b.balance.addressBalance ?? '0')))
+                .catch(() => { });
             for (let attempt = 0; attempt < 2; attempt++) {
                 const epoch = this.cache.mutationEpoch(wallet, coinType);
                 const refs = [];
@@ -128,6 +132,7 @@ class CentralExecutor {
                     }
                     cursor = page.hasNextPage ? page.cursor : null;
                 } while (cursor);
+                await abP;
                 if (this.cache.reconcile(wallet, coinType, refs, epoch, quietIfUnchanged))
                     return;
             }

package/dist/trade/executor/coin_cache.d.ts

@@ -11,6 +11,8 @@ export declare class InProcessCoinCache {
     private amountFmt?;
     setAmountFormatter(fn: (coinType: string, raw: bigint) => string): void;
     private fmt;
+    private addressBalances;
+    setAddressBalance(wallet: string, coinType: string, ab: bigint): void;
     logCoinBreakdown(wallet: string, coinType: string, reason: string, quiet?: boolean): void;
     private walletMap;
     private list;

package/dist/trade/executor/coin_cache.js

@@ -8,6 +8,7 @@ class InProcessCoinCache {
         this.inflight = new Map();
         this.committedAt = new Map();
         this.epochs = new Map();
+        this.addressBalances = new Map();
     }
     commitKey(wallet, coinType, objectId) { return `${wallet}|${coinType}|${objectId}`; }
     epochKey(wallet, coinType) { return `${wallet}|${coinType}`; }
@@ -20,6 +21,7 @@ class InProcessCoinCache {
     }
     setAmountFormatter(fn) { this.amountFmt = fn; }
     fmt(coinType, raw) { return this.amountFmt ? this.amountFmt(coinType, raw) : `${raw.toString()}(raw)`; }
+    setAddressBalance(wallet, coinType, ab) { this.addressBalances.set(`${wallet}|${coinType}`, ab); }
     logCoinBreakdown(wallet, coinType, reason, quiet = false) {
         const avail = this.list(wallet, coinType);
         const inUse = [];
@@ -29,7 +31,9 @@ class InProcessCoinCache {
         }
         const symbol = coinType.split('::').pop();
         const sum = (cs) => cs.reduce((s, c) => s + BigInt(c.balance), 0n);
-        const availT = sum(avail), useT = sum(inUse), grand = availT + useT;
+        const availT = sum(avail), useT = sum(inUse), objT = availT + useT;
+        const ab = this.addressBalances.get(`${wallet}|${coinType}`) ?? 0n;
+        const grand = objT + ab;
         const mapObj = (cs) => cs.map(c => ({
             objectId: c.objectId,
             version: c.version,
@@ -38,11 +42,13 @@ class InProcessCoinCache {
         const detail = {
             reason, wallet, symbol, coinType,
             total: this.fmt(coinType, grand),
+            address_balance: this.fmt(coinType, ab),
+            objects_total: this.fmt(coinType, objT),
             available_count: avail.length, available_total: this.fmt(coinType, availT), available: mapObj(avail),
             in_use_count: inUse.length, in_use_total: this.fmt(coinType, useT), in_use: mapObj(inUse),
         };
-        const useStr = inUse.length ? `, ${inUse.length} 个正在交易中` : '';
-        const header = `[coin-cache] ${reason} ${symbol}: 共 ${this.fmt(coinType, grand)}（可用 ${avail.length} 个${useStr}）`;
+        const useStr = inUse.length ? ` +${inUse.length}个交易中` : '';
+        const header = `[coin-cache] ${reason} ${symbol}: 共 ${this.fmt(coinType, grand)} = 对象 ${this.fmt(coinType, objT)}(${avail.length}个${useStr}) + address-balance ${this.fmt(coinType, ab)}`;
         if (quiet)
             (0, dist_1.log_debug)(header, detail);
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sui-common",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "Sui common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",