@clonegod/ttd-sui-common 1.0.92 → 1.0.94

package/dist/grpc/state-service.js

@@ -0,0 +1,107 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StateService = void 0;
+const utils_1 = require("../utils");
+class StateService {
+    constructor(connection) {
+        this.connection = connection;
+        this.stateClient = connection.createServiceClient('state_service.proto', 'StateService');
+    }
+    getBalance(owner, coinType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!owner) {
+                throw new Error('owner 参数是必需的');
+            }
+            if (!coinType) {
+                coinType = '0x2::sui::SUI';
+            }
+            return new Promise((resolve, reject) => {
+                const request = {
+                    owner: owner,
+                    coin_type: coinType
+                };
+                this.stateClient.GetBalance(request, this.connection.getMetadata(), (error, response) => {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve(response);
+                });
+            });
+        });
+    }
+    listBalances(owner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                this.stateClient.ListBalances({ owner }, this.connection.getMetadata(), (error, response) => {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve(response);
+                });
+            });
+        });
+    }
+    getCoinInfo(coinType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                this.stateClient.GetCoinInfo({ coin_type: coinType }, this.connection.getMetadata(), (error, response) => {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve(response);
+                });
+            });
+        });
+    }
+    listOwnedObjects(owner, coinType, limit, readMask) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const request = { owner };
+                if (coinType) {
+                    const objectType = coinType.startsWith('0x2::coin::Coin<')
+                        ? coinType
+                        : `0x2::coin::Coin<${coinType}>`;
+                    request.object_type = objectType;
+                }
+                if (limit)
+                    request.page_size = limit;
+                if (readMask && readMask.length > 0) {
+                    request.read_mask = {
+                        paths: readMask
+                    };
+                }
+                else {
+                    request.read_mask = {
+                        paths: [
+                            "object_id",
+                            "version",
+                            "digest",
+                            "owner",
+                            "object_type",
+                            "storage_rebate",
+                            "balance"
+                        ]
+                    };
+                }
+                this.stateClient.ListOwnedObjects(request, this.connection.getMetadata(), (error, response) => {
+                    if (error)
+                        reject(error);
+                    else {
+                        let res = (0, utils_1.decodeBytes)(response);
+                        resolve(res);
+                    }
+                });
+            });
+        });
+    }
+}
+exports.StateService = StateService;

package/dist/grpc/sui-grpc-client.d.ts

@@ -1,12 +1,12 @@
 import { LedgerService } from "./ledger-service";
-import { LiveDataService } from "./live-data-service";
+import { StateService } from "./state-service";
 import { SubscriptionService } from "./subscription-service";
 import { TransactionService } from "./transaction-service";
 import { GasPriceCache } from "./gas-price-cache";
 export declare class SuiGrpcClient {
     ledgerService: LedgerService;
     transactionService: TransactionService;
-    liveDataService: LiveDataService;
+    stateService: StateService;
     subscriptionService: SubscriptionService;
     gasPriceCache: GasPriceCache;
     gas_price: number;

package/dist/grpc/sui-grpc-client.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiGrpcClient = void 0;
 const grpc_connection_1 = require("./grpc-connection");
 const ledger_service_1 = require("./ledger-service");
-const live_data_service_1 = require("./live-data-service");
+const state_service_1 = require("./state-service");
 const subscription_service_1 = require("./subscription-service");
 const transaction_service_1 = require("./transaction-service");
 const gas_price_cache_1 = require("./gas-price-cache");
@@ -25,7 +25,7 @@ class SuiGrpcClient {
         const grpcClient = grpc_connection_1.GrpcConnection.getInstance(process.env.SUI_GRPC_ENDPOINT, process.env.SUI_GRPC_TOKEN);
         this.ledgerService = new ledger_service_1.LedgerService(grpcClient);
         this.transactionService = new transaction_service_1.TransactionService(grpcClient);
-        this.liveDataService = new live_data_service_1.LiveDataService(grpcClient);
+        this.stateService = new state_service_1.StateService(grpcClient);
         this.subscriptionService = new subscription_service_1.SubscriptionService(grpcClient);
         this.gasPriceCache = gas_price_cache_1.GasPriceCache.getInstance(this.ledgerService);
     }

package/dist/redis/redis_client.d.ts

@@ -9,7 +9,7 @@ export declare class SimpleRedisClient {
     getRedisClient(): Promise<RedisClientType>;
     private getLockKey;
     acquireLock(lock_key: string, lock_value: string, expireSeconds?: number): Promise<boolean>;
-    private releaseLock;
+    releaseLock(lock_key: string, lock_value: string): Promise<boolean>;
     withLock<T>(lock_identifier: string, callback: () => Promise<T>, release_lock_delay_ms?: number): Promise<T>;
     getValue(key: string): Promise<string>;
     setValue(key: string, value: string, expireSeconds: number): Promise<any>;

package/dist/test/test.js

@@ -38,7 +38,7 @@ dotenv.config();
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = __importStar(require("@grpc/proto-loader"));
 const path = __importStar(require("path"));
-const PROTO_PATH = path.join(__dirname, 'protos/sui/rpc/v2beta2/ledger_service.proto');
+const PROTO_PATH = path.join(__dirname, 'protos/sui/rpc/v2/ledger_service.proto');
 const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
     keepCase: true,
     longs: String,
@@ -48,7 +48,7 @@ const packageDefinition = protoLoader.loadSync(PROTO_PATH, {
     includeDirs: [path.join(__dirname, 'protos')],
 });
 const suiProto = grpc.loadPackageDefinition(packageDefinition);
-const LedgerService = suiProto.sui.rpc.v2beta2.LedgerService;
+const LedgerService = suiProto.sui.rpc.v2.LedgerService;
 const endpoint = process.env.SUI_GRPC_ENDPOINT;
 const token = process.env.SUI_GRPC_TOKEN;
 if (!endpoint || !token) {

package/dist/test/test_grpc.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dist_1 = require("@clonegod/ttd-core/dist");
 const grpc_connection_1 = require("../grpc/grpc-connection");
 const ledger_service_1 = require("../grpc/ledger-service");
-const live_data_service_1 = require("../grpc/live-data-service");
+const state_service_1 = require("../grpc/state-service");
 const grpc_endpoint = process.env.SUI_GRPC_ENDPOINT;
 const grpc_token = process.env.SUI_GRPC_TOKEN;
 const test_get_service_info = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -53,27 +53,27 @@ const test_get_transaction = (txid) => __awaiter(void 0, void 0, void 0, functio
 });
 const test_get_balance = (wallet_address, coin_type) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = grpc_connection_1.GrpcConnection.getInstance(grpc_endpoint, grpc_token);
-    const liveDataService = new live_data_service_1.LiveDataService(connection);
-    const balance = yield liveDataService.getBalance(wallet_address, coin_type);
+    const stateService = new state_service_1.StateService(connection);
+    const balance = yield stateService.getBalance(wallet_address, coin_type);
     (0, dist_1.log_info)(`balance`, balance);
 });
 const test_list_balances = (wallet_address) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = grpc_connection_1.GrpcConnection.getInstance(grpc_endpoint, grpc_token);
-    const liveDataService = new live_data_service_1.LiveDataService(connection);
-    const balances = yield liveDataService.listBalances(wallet_address);
+    const stateService = new state_service_1.StateService(connection);
+    const balances = yield stateService.listBalances(wallet_address);
     (0, dist_1.log_info)(`balances`, balances);
 });
 const test_get_coin_info = (coin_type) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = grpc_connection_1.GrpcConnection.getInstance(grpc_endpoint, grpc_token);
-    const liveDataService = new live_data_service_1.LiveDataService(connection);
-    const coinInfo = yield liveDataService.getCoinInfo(coin_type);
+    const stateService = new state_service_1.StateService(connection);
+    const coinInfo = yield stateService.getCoinInfo(coin_type);
     (0, dist_1.log_info)(`coinInfo`, coinInfo);
 });
 const test_list_owned_objects = (wallet_address, coin_type) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = grpc_connection_1.GrpcConnection.getInstance(grpc_endpoint, grpc_token);
     const startTime = Date.now();
-    const liveDataService = new live_data_service_1.LiveDataService(connection);
-    const ownedObjects = yield liveDataService.listOwnedObjects(wallet_address, coin_type);
+    const stateService = new state_service_1.StateService(connection);
+    const ownedObjects = yield stateService.listOwnedObjects(wallet_address, coin_type);
     const duration = Date.now() - startTime;
     if (!coin_type) {
         (0, dist_1.log_info)(`list all owned objects, count=${ownedObjects.objects.length}, cost ${duration}ms`);

package/dist/trade/abstract_sui_dex_trade_plus.js

@@ -90,7 +90,7 @@ class AbstractSuiDexTradePlus extends dist_1.AbastrcatTrade {
             const maxRetryTime = 200;
             const retryDelay = 20;
             do {
-                lockAcquired = yield this.redisClient.acquireLock(lockKey, lockValue, 200);
+                lockAcquired = yield this.redisClient.acquireLock(lockKey, lockValue, 2);
                 if (lockAcquired) {
                     break;
                 }
@@ -100,118 +100,127 @@ class AbstractSuiDexTradePlus extends dist_1.AbastrcatTrade {
                 throw new Error(`choose wallet, acquire lock failed: ${lockKey}, took ${Date.now() - start_time}ms`);
             }
             (0, dist_1.log_info)(`choose wallet, acquire lock success: ${lockKey}, took ${Date.now() - start_time}ms`);
-            const { inputToken } = this.determineInputOutputTokens(context.order_msg, context.pool_info);
-            console.log('inputToken', inputToken);
-            const requiredAmount = new decimal_js_1.default(context.order_msg.amount);
-            const wallet_assets = yield this.redisClient.hgetall('sui:wallet:assets');
-            if (!wallet_assets || Object.keys(wallet_assets).length === 0) {
-                throw new Error('没有找到钱包资产信息，请确保钱包监控服务正在运行');
-            }
-            const wallet_assets_map = {};
-            for (const [walletAddress, assetsJson] of Object.entries(wallet_assets)) {
-                try {
-                    wallet_assets_map[walletAddress] = JSON.parse(assetsJson);
-                }
-                catch (error) {
-                    console.warn(`解析钱包资产数据失败: ${walletAddress}`, error);
+            try {
+                const { inputToken } = this.determineInputOutputTokens(context.order_msg, context.pool_info);
+                console.log('inputToken', inputToken);
+                const requiredAmount = new decimal_js_1.default(context.order_msg.amount);
+                const wallet_assets = yield this.redisClient.hgetall('sui:wallet:assets');
+                if (!wallet_assets || Object.keys(wallet_assets).length === 0) {
+                    throw new Error('没有找到钱包资产信息，请确保钱包监控服务正在运行');
                 }
-            }
-            const availableWallets = [];
-            const allWallets = [];
-            for (const [walletAddress, assets] of Object.entries(wallet_assets_map)) {
-                try {
-                    const wallet = (_a = this.group_wallets) === null || _a === void 0 ? void 0 : _a.find(w => w.getPublicKey().toSuiAddress().toLowerCase() === walletAddress.toLowerCase());
-                    if (!wallet) {
-                        continue;
+                const wallet_assets_map = {};
+                for (const [walletAddress, assetsJson] of Object.entries(wallet_assets)) {
+                    try {
+                        wallet_assets_map[walletAddress] = JSON.parse(assetsJson);
                     }
-                    const tokenAsset = (_b = assets.tokens) === null || _b === void 0 ? void 0 : _b.find((token) => (0, index_1.normalizeSuiTokenAddress)(token.address) === (0, index_1.normalizeSuiTokenAddress)(inputToken.address));
-                    let tokenBalance = (tokenAsset === null || tokenAsset === void 0 ? void 0 : tokenAsset.balance) || '0';
-                    const balanceDecimal = new decimal_js_1.default(tokenBalance);
-                    if (balanceDecimal.gte(requiredAmount)) {
-                        availableWallets.push({
+                    catch (error) {
+                        console.warn(`解析钱包资产数据失败: ${walletAddress}`, error);
+                    }
+                }
+                const availableWallets = [];
+                const allWallets = [];
+                for (const [walletAddress, assets] of Object.entries(wallet_assets_map)) {
+                    try {
+                        const wallet = (_a = this.group_wallets) === null || _a === void 0 ? void 0 : _a.find(w => w.getPublicKey().toSuiAddress().toLowerCase() === walletAddress.toLowerCase());
+                        if (!wallet) {
+                            continue;
+                        }
+                        const tokenAsset = (_b = assets.tokens) === null || _b === void 0 ? void 0 : _b.find((token) => (0, index_1.normalizeSuiTokenAddress)(token.address) === (0, index_1.normalizeSuiTokenAddress)(inputToken.address));
+                        let tokenBalance = (tokenAsset === null || tokenAsset === void 0 ? void 0 : tokenAsset.balance) || '0';
+                        const balanceDecimal = new decimal_js_1.default(tokenBalance);
+                        if (balanceDecimal.gte(requiredAmount)) {
+                            availableWallets.push({
+                                wallet,
+                                balance: tokenBalance
+                            });
+                        }
+                        else {
+                            console.log(`钱包 ${walletAddress} 余额不足: ${tokenBalance} ${inputToken.symbol} < ${requiredAmount} ${inputToken.symbol}`);
+                        }
+                        allWallets.push({
                             wallet,
                             balance: tokenBalance
                         });
                     }
-                    else {
-                        console.log(`钱包 ${walletAddress} 余额不足: ${tokenBalance} ${inputToken.symbol} < ${requiredAmount} ${inputToken.symbol}`);
+                    catch (error) {
+                        console.warn(`处理钱包资产时出错: ${walletAddress}`, error);
                     }
-                    allWallets.push({
-                        wallet,
-                        balance: tokenBalance
-                    });
                 }
-                catch (error) {
-                    console.warn(`处理钱包资产时出错: ${walletAddress}`, error);
+                if (availableWallets.length === 0) {
+                    let error_msg = `all wallets are insufficient, required: ${requiredAmount} ${inputToken.symbol}`;
+                    (0, dist_1.log_warn)(error_msg);
+                    allWallets.forEach((walletInfo, index) => {
+                        const walletAddress = walletInfo.wallet.getPublicKey().toSuiAddress();
+                        const shortAddress = walletAddress.substring(0, 6) + '...' + walletAddress.substring(walletAddress.length - 4);
+                        console.log(`${index + 1}. ${shortAddress}: ${walletInfo.balance} ${inputToken.symbol}`);
+                    });
+                    throw new Error(error_msg);
                 }
-            }
-            if (availableWallets.length === 0) {
-                let error_msg = `all wallets are insufficient, required: ${requiredAmount} ${inputToken.symbol}`;
-                (0, dist_1.log_warn)(error_msg);
-                allWallets.forEach((walletInfo, index) => {
-                    const walletAddress = walletInfo.wallet.getPublicKey().toSuiAddress();
-                    const shortAddress = walletAddress.substring(0, 6) + '...' + walletAddress.substring(walletAddress.length - 4);
-                    console.log(`${index + 1}. ${shortAddress}: ${walletInfo.balance} ${inputToken.symbol}`);
-                });
-                throw new Error(error_msg);
-            }
-            console.log('availableWallets', availableWallets.map(w => w.wallet.getPublicKey().toSuiAddress()));
-            const wallet_last_used = yield this.redisClient.hgetall('sui:wallet:last_used');
-            for (const availableWallet of availableWallets) {
-                const walletAddress = availableWallet.wallet.getPublicKey().toSuiAddress();
-                const lastUsedData = wallet_last_used === null || wallet_last_used === void 0 ? void 0 : wallet_last_used[walletAddress];
-                if (lastUsedData) {
-                    try {
-                        const lastUsedInfo = JSON.parse(lastUsedData);
-                        availableWallet.lastUsedAt = lastUsedInfo.lastUsedAt;
+                console.log('availableWallets', availableWallets.map(w => w.wallet.getPublicKey().toSuiAddress()));
+                const wallet_last_used = yield this.redisClient.hgetall('sui:wallet:last_used');
+                for (const availableWallet of availableWallets) {
+                    const walletAddress = availableWallet.wallet.getPublicKey().toSuiAddress();
+                    const lastUsedData = wallet_last_used === null || wallet_last_used === void 0 ? void 0 : wallet_last_used[walletAddress];
+                    if (lastUsedData) {
+                        try {
+                            const lastUsedInfo = JSON.parse(lastUsedData);
+                            availableWallet.lastUsedAt = lastUsedInfo.lastUsedAt;
+                        }
+                        catch (error) {
+                            console.warn(`解析钱包最后使用时间失败: ${walletAddress}`, error);
+                        }
                     }
-                    catch (error) {
-                        console.warn(`解析钱包最后使用时间失败: ${walletAddress}`, error);
+                    else {
+                        yield this.redisClient.hsetValue('sui:wallet:last_used', walletAddress, JSON.stringify({
+                            lastUsedAt: 0,
+                            lastUsedTime: new Date(0).toISOString()
+                        }), 24 * 60 * 60);
+                        availableWallet.lastUsedAt = 0;
                     }
                 }
-                else {
-                    yield this.redisClient.hsetValue('sui:wallet:last_used', walletAddress, JSON.stringify({
-                        lastUsedAt: 0,
-                        lastUsedTime: new Date(0).toISOString()
-                    }), 24 * 60 * 60);
-                    availableWallet.lastUsedAt = 0;
-                }
-            }
-            let selectedWallet;
-            let selectionStrategy;
-            if (availableWallets.length === 1) {
-                selectedWallet = availableWallets[0].wallet;
-                selectionStrategy = 'OnlyOne';
-            }
-            else {
-                const hasUsageHistory = wallet_last_used && Object.keys(wallet_last_used).length > 0;
-                if (hasUsageHistory) {
-                    availableWallets.sort((a, b) => {
-                        const aTime = a.lastUsedAt || 0;
-                        const bTime = b.lastUsedAt || 0;
-                        return aTime - bTime;
-                    });
+                let selectedWallet;
+                let selectionStrategy;
+                if (availableWallets.length === 1) {
                     selectedWallet = availableWallets[0].wallet;
-                    selectionStrategy = 'MaxLastUsed';
+                    selectionStrategy = 'OnlyOne';
                 }
                 else {
-                    availableWallets.sort((a, b) => {
-                        const aBalance = new decimal_js_1.default(a.balance);
-                        const bBalance = new decimal_js_1.default(b.balance);
-                        return bBalance.cmp(aBalance);
-                    });
-                    selectedWallet = availableWallets[0].wallet;
-                    selectionStrategy = 'MaxBalance';
+                    const hasUsageHistory = wallet_last_used && Object.keys(wallet_last_used).length > 0;
+                    if (hasUsageHistory) {
+                        availableWallets.sort((a, b) => {
+                            const aTime = a.lastUsedAt || 0;
+                            const bTime = b.lastUsedAt || 0;
+                            return aTime - bTime;
+                        });
+                        selectedWallet = availableWallets[0].wallet;
+                        selectionStrategy = 'MaxLastUsed';
+                    }
+                    else {
+                        availableWallets.sort((a, b) => {
+                            const aBalance = new decimal_js_1.default(a.balance);
+                            const bBalance = new decimal_js_1.default(b.balance);
+                            return bBalance.cmp(aBalance);
+                        });
+                        selectedWallet = availableWallets[0].wallet;
+                        selectionStrategy = 'MaxBalance';
+                    }
                 }
+                const selectedWalletAddress = selectedWallet.getPublicKey().toSuiAddress();
+                yield this.redisClient.hsetValue('sui:wallet:last_used', selectedWalletAddress, JSON.stringify({
+                    lastUsedAt: Date.now(),
+                    lastUsedTime: new Date().toISOString()
+                }), 24 * 60 * 60);
+                const selectedWalletInfo = availableWallets.find(w => w.wallet.getPublicKey().toSuiAddress() === selectedWalletAddress);
+                (0, dist_1.log_info)(`Choose wallet: ${selectionStrategy} -> ${selectedWalletAddress}, balance: ${selectedWalletInfo === null || selectedWalletInfo === void 0 ? void 0 : selectedWalletInfo.balance} ${inputToken.symbol}, required: ${requiredAmount} ${inputToken.symbol}`);
+                return selectedWallet;
+            }
+            catch (error) {
+                (0, dist_1.log_error)(`choose wallet failed, error: ${error.message}`, error);
+                throw error;
+            }
+            finally {
+                yield this.redisClient.releaseLock(lockKey, lockValue);
             }
-            const selectedWalletAddress = selectedWallet.getPublicKey().toSuiAddress();
-            yield this.redisClient.hsetValue('sui:wallet:last_used', selectedWalletAddress, JSON.stringify({
-                lastUsedAt: Date.now(),
-                lastUsedTime: new Date().toISOString()
-            }), 24 * 60 * 60);
-            const selectedWalletInfo = availableWallets.find(w => w.wallet.getPublicKey().toSuiAddress() === selectedWalletAddress);
-            (0, dist_1.log_info)(`Choose wallet: ${selectionStrategy} -> ${selectedWalletAddress}, balance: ${selectedWalletInfo === null || selectedWalletInfo === void 0 ? void 0 : selectedWalletInfo.balance} ${inputToken.symbol}, required: ${requiredAmount} ${inputToken.symbol}`);
-            return selectedWallet;
         });
     }
     determineInputOutputTokens(order_msg, pool_info) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sui-common",
-  "version": "1.0.92",
+  "version": "1.0.94",
   "description": "Sui common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "2.0.67",
+    "@clonegod/ttd-core": "2.0.85",
     "@grpc/grpc-js": "^1.13.4",
     "@grpc/proto-loader": "^0.8.0",
     "@mysten/sui": "^1.37.5",