@clonegod/ttd-sui-common 1.0.52 → 1.0.54

package/dist/redis/redis_client.js

@@ -70,7 +70,7 @@ class SimpleRedisClient {
         });
     }
     withLock(lock_identifier_1, callback_1) {
-        return __awaiter(this, arguments, void 0, function* (lock_identifier, callback, release_lock_delay_ms = 2000) {
+        return __awaiter(this, arguments, void 0, function* (lock_identifier, callback, release_lock_delay_ms = 500) {
             const lock_key = this.getLockKey(lock_identifier);
             const lock_value = `${Date.now()}-${Math.random().toString(36).substring(2, 15)}`;
             let retries = 0;
@@ -96,6 +96,7 @@ class SimpleRedisClient {
                 if (acquired) {
                     const release_delay = parseInt(process.env.NONCE_LOCK_RELEASE_DELAY_MS || String(release_lock_delay_ms));
                     if (release_delay > 0) {
+                        (0, dist_1.log_warn)(`withLock release_lock_delay_ms=${release_delay}ms`);
                         yield (0, dist_1.sleep)(release_delay);
                     }
                     yield this.releaseLock(lock_key, lock_value);

package/dist/trade/abstract_sui_dex_trade_plus.d.ts

@@ -1,7 +1,9 @@
+import { QuoteResultType } from "@clonegod/ttd-core";
 import { AbastrcatTrade, AppConfig, TradeContext } from "@clonegod/ttd-core/dist";
-import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
 import { SuiClient } from "@mysten/sui/client";
-import { SuiGrpcClient, SuiTxSender } from '../index';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+import { Transaction } from '@mysten/sui/transactions';
+import { PoolObjectInfo, SuiGrpcClient, SuiTxSender } from '../index';
 import { SimpleRedisClient } from '../redis';
 export declare abstract class AbstractSuiDexTradePlus extends AbastrcatTrade {
     protected appConfig: AppConfig;
@@ -27,6 +29,11 @@ export declare abstract class AbstractSuiDexTradePlus extends AbastrcatTrade {
         inputToken: any;
         outputToken: any;
     };
+    local_calculate_output_amt(context: TradeContext): Promise<QuoteResultType>;
+    protected getWalletAssetsFromRedis(walletAddress: string): Promise<any>;
+    protected getObjectInfo(objectId: string): Promise<PoolObjectInfo | null>;
+    protected compareBigIntBalance(a: any, b: any): number;
+    protected mergeTokenObjects(tx: Transaction, primaryCoin: any, objectsToMerge: any[], tokenSymbol: string): void;
     abstract execute(context: TradeContext, retryCount?: number): Promise<string>;
     protected abstract initConfigs(): Promise<void>;
 }

package/dist/trade/abstract_sui_dex_trade_plus.js

@@ -14,11 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractSuiDexTradePlus = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
-const ed25519_1 = require("@mysten/sui/keypairs/ed25519");
 const client_1 = require("@mysten/sui/client");
+const ed25519_1 = require("@mysten/sui/keypairs/ed25519");
+const transactions_1 = require("@mysten/sui/transactions");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const index_1 = require("../index");
 const redis_1 = require("../redis");
-const decimal_js_1 = __importDefault(require("decimal.js"));
 class AbstractSuiDexTradePlus extends dist_1.AbastrcatTrade {
     constructor(appConfig, grpcClient) {
         super();
@@ -212,5 +213,110 @@ class AbstractSuiDexTradePlus extends dist_1.AbastrcatTrade {
         }
         return { inputToken, outputToken };
     }
+    local_calculate_output_amt(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { price_msg, order_msg, pool_info, trade_runtime, slippage_bps } = context;
+            let { ask, bid } = price_msg;
+            const { aToB, amount: uiAmount, price: cex_order_price } = order_msg;
+            let { inputToken, outputToken } = (0, dist_1.get_input_out_token)(pool_info, aToB);
+            let amountIn = new decimal_js_1.default(uiAmount).mul(Math.pow(10, inputToken.decimals));
+            let slippage = slippage_bps / 10000;
+            let price;
+            let amountOut;
+            let amountOutMin;
+            if (aToB) {
+                price = cex_order_price !== null && cex_order_price !== void 0 ? cex_order_price : bid.price;
+                amountOut = new decimal_js_1.default(uiAmount).mul(price).mul(Math.pow(10, outputToken.decimals));
+                amountOutMin = amountOut.mul(1 - slippage);
+            }
+            else {
+                price = cex_order_price !== null && cex_order_price !== void 0 ? cex_order_price : ask.price;
+                amountOut = new decimal_js_1.default(uiAmount).div(price).mul(Math.pow(10, outputToken.decimals));
+                amountOutMin = amountOut.mul(1 - slippage);
+            }
+            let quote_result = {
+                inputToken,
+                outputToken,
+                amountIn: Number(amountIn.toFixed(0)),
+                amountOut: Number(amountOut.toFixed(0)),
+                amountOutMin: Number(amountOutMin.toFixed(0)),
+                slippageBps: slippage_bps,
+                priceImpact: 0,
+                price: price.toString()
+            };
+            return quote_result;
+        });
+    }
+    getWalletAssetsFromRedis(walletAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const redisClient = this.appConfig.arb_cache.redis_cmd.redis_client;
+                const walletAssetsJson = yield redisClient.HGET('sui:wallet:assets', walletAddress);
+                if (!walletAssetsJson) {
+                    return null;
+                }
+                return JSON.parse(walletAssetsJson);
+            }
+            catch (error) {
+                (0, dist_1.log_error)(`从Redis获取钱包资产信息失败`, error);
+                throw error;
+            }
+        });
+    }
+    getObjectInfo(objectId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let startTime = Date.now();
+                const objectResponse = yield this.grpcClient.ledgerService.getObject(objectId, [
+                    'object_id',
+                    'version',
+                    'digest',
+                    'owner',
+                ]);
+                let objectInfo = null;
+                if (objectResponse.object) {
+                    objectInfo = {
+                        objectId: objectId,
+                        version: objectResponse.object.version,
+                        digest: objectResponse.object.digest,
+                        initialSharedVersion: objectResponse.object.owner.version
+                    };
+                }
+                (0, dist_1.log_info)(`get object info success, cost: ${Date.now() - startTime} ms`, objectInfo);
+                return objectInfo;
+            }
+            catch (error) {
+                (0, dist_1.log_error)(`get object info failed, object_id=${objectId}`, error);
+                return null;
+            }
+        });
+    }
+    compareBigIntBalance(a, b) {
+        const balanceA = BigInt(a.balance);
+        const balanceB = BigInt(b.balance);
+        if (balanceA > balanceB)
+            return -1;
+        if (balanceA < balanceB)
+            return 1;
+        return 0;
+    }
+    mergeTokenObjects(tx, primaryCoin, objectsToMerge, tokenSymbol) {
+        if (objectsToMerge.length === 0)
+            return;
+        const other_objects = objectsToMerge.map((obj) => {
+            if (obj.version && obj.digest) {
+                return tx.object(transactions_1.Inputs.ObjectRef({
+                    objectId: obj.objectId,
+                    version: obj.version,
+                    digest: obj.digest
+                }));
+            }
+            else {
+                throw new Error(`${tokenSymbol} 对象 ${obj.objectId} 数据不完整`);
+            }
+        });
+        tx.mergeCoins(primaryCoin, other_objects);
+        (0, dist_1.log_info)(`✅ ${tokenSymbol} 进行对象合并，涉及 ${other_objects.length} 个对象`);
+    }
 }
 exports.AbstractSuiDexTradePlus = AbstractSuiDexTradePlus;

package/dist/type/index.d.ts

@@ -16,3 +16,9 @@ export interface SimpleTxEventsType {
     pair: string;
     events: any[];
 }
+export interface PoolObjectInfo {
+    objectId: string;
+    version: string;
+    digest: string;
+    initialSharedVersion?: string;
+}

package/package.json

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