@clonegod/ttd-sui-common 1.0.87 → 1.0.89

package/dist/trade/parse/sui_tx_parser.js

@@ -100,13 +100,13 @@ class SuiTransactionParser {
         const storageRebate = new decimal_js_1.default(gasUsed.storage_rebate || 0);
         const nonRefundableStorageFee = new decimal_js_1.default(gasUsed.non_refundable_storage_fee || 0);
         const actualStorageCost = storageCost.minus(storageRebate).plus(nonRefundableStorageFee);
-        const base_fee = actualStorageCost.div(Math.pow(10, 9)).toNumber();
-        const priority_fee = computationCost.div(Math.pow(10, 9)).toNumber();
-        const total_fee = base_fee + priority_fee;
+        const baseFee = actualStorageCost.div(Math.pow(10, 9));
+        const priorityFee = computationCost.div(Math.pow(10, 9));
+        const totalFee = baseFee.plus(priorityFee);
         return {
-            base_fee,
-            priority_fee,
-            total_fee
+            base_fee: baseFee.toNumber(),
+            priority_fee: priorityFee.toNumber(),
+            total_fee: totalFee.toNumber()
         };
     }
     calc_tx_price(tokenAChange, tokenBChange, pool_info) {

package/dist/trade/send_tx/index.d.ts

@@ -6,7 +6,7 @@ export declare class SuiTxSender {
     sui_client: SuiClient;
     grpcClient: SuiGrpcClient;
     constructor(appConfig: AppConfig, sui_client: SuiClient, grpcClient: SuiGrpcClient);
-    send_tx: (signedTxBytes: string, signature: string, txDigest: string, send_type: string, read_mask_fields?: string[]) => Promise<void>;
+    send_tx: (signedTxBytes: string, signature: string, txDigest: string, send_type: string, read_mask_fields?: string[], timeoutMs?: number) => Promise<void>;
     private sendTxByGrpc;
     private sendTxByRpc;
 }

package/dist/trade/send_tx/index.js

@@ -13,19 +13,19 @@ exports.SuiTxSender = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 class SuiTxSender {
     constructor(appConfig, sui_client, grpcClient) {
-        this.send_tx = (signedTxBytes_1, signature_1, txDigest_1, send_type_1, ...args_1) => __awaiter(this, [signedTxBytes_1, signature_1, txDigest_1, send_type_1, ...args_1], void 0, function* (signedTxBytes, signature, txDigest, send_type, read_mask_fields = ['transaction']) {
+        this.send_tx = (signedTxBytes_1, signature_1, txDigest_1, send_type_1, ...args_1) => __awaiter(this, [signedTxBytes_1, signature_1, txDigest_1, send_type_1, ...args_1], void 0, function* (signedTxBytes, signature, txDigest, send_type, read_mask_fields = ['transaction'], timeoutMs = 3000) {
             const start_time = Date.now();
             send_type = (send_type || 'ALL').toUpperCase();
             if (send_type === 'GRPC') {
-                yield this.sendTxByGrpc(signedTxBytes, signature, txDigest, read_mask_fields);
+                yield this.sendTxByGrpc(signedTxBytes, signature, txDigest, read_mask_fields, timeoutMs);
             }
             else if (send_type === 'RPC') {
-                yield this.sendTxByRpc(signedTxBytes, signature, txDigest);
+                yield this.sendTxByRpc(signedTxBytes, signature, txDigest, timeoutMs);
             }
             else {
                 yield Promise.race([
-                    this.sendTxByGrpc(signedTxBytes, signature, txDigest, read_mask_fields),
-                    this.sendTxByRpc(signedTxBytes, signature, txDigest)
+                    this.sendTxByGrpc(signedTxBytes, signature, txDigest, read_mask_fields, timeoutMs),
+                    this.sendTxByRpc(signedTxBytes, signature, txDigest, timeoutMs)
                 ]);
             }
             (0, dist_1.log_info)(`send_tx, txid=${txDigest}, send_type=${send_type}, cost=${Date.now() - start_time}ms`);
@@ -35,12 +35,28 @@ class SuiTxSender {
         this.grpcClient = grpcClient;
     }
     sendTxByGrpc(signedTxBytes_1, signature_1, txDigest_1) {
-        return __awaiter(this, arguments, void 0, function* (signedTxBytes, signature, txDigest, read_mask_fields = ['transaction']) {
+        return __awaiter(this, arguments, void 0, function* (signedTxBytes, signature, txDigest, read_mask_fields = ['transaction'], timeoutMs = 3000) {
             const bcsBytes = Buffer.from(signedTxBytes, 'base64');
             const signatureBytes = Buffer.from(signature, 'base64');
             try {
-                let response = yield this.grpcClient.transactionService.executeTransaction(bcsBytes, signatureBytes, read_mask_fields);
-                this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, response);
+                const GRPC_TIMEOUT_SENTINEL = Symbol('grpc-timeout');
+                let timer;
+                const timeoutPromise = new Promise((resolve) => {
+                    timer = setTimeout(() => {
+                        resolve(GRPC_TIMEOUT_SENTINEL);
+                    }, timeoutMs);
+                });
+                const execPromise = this.grpcClient.transactionService
+                    .executeTransaction(bcsBytes, signatureBytes, read_mask_fields);
+                const result = yield Promise.race([execPromise, timeoutPromise]);
+                if (timer) {
+                    clearTimeout(timer);
+                    timer = null;
+                }
+                if (result === GRPC_TIMEOUT_SENTINEL) {
+                    throw new Error(`grpc executeTransaction timeout after ${timeoutMs}ms`);
+                }
+                this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, result);
             }
             catch (error) {
                 (0, dist_1.log_warn)(`send tx by grpc failed!!! txid=${txDigest}, error=${error.message}`);
@@ -48,10 +64,17 @@ class SuiTxSender {
             }
         });
     }
-    sendTxByRpc(signedTxBytes, signature, txDigest) {
-        return __awaiter(this, void 0, void 0, function* () {
+    sendTxByRpc(signedTxBytes_1, signature_1, txDigest_1) {
+        return __awaiter(this, arguments, void 0, function* (signedTxBytes, signature, txDigest, timeoutMs = 3000) {
             try {
-                let _response = yield this.sui_client.executeTransactionBlock({
+                const RPC_TIMEOUT_SENTINEL = Symbol('rpc-timeout');
+                let timer;
+                const timeoutPromise = new Promise((resolve) => {
+                    timer = setTimeout(() => {
+                        resolve(RPC_TIMEOUT_SENTINEL);
+                    }, timeoutMs);
+                });
+                const execPromise = this.sui_client.executeTransactionBlock({
                     transactionBlock: signedTxBytes,
                     signature: signature,
                     options: {
@@ -61,6 +84,14 @@ class SuiTxSender {
                         showEffects: true
                     }
                 });
+                const result = yield Promise.race([execPromise, timeoutPromise]);
+                if (timer) {
+                    clearTimeout(timer);
+                    timer = null;
+                }
+                if (result === RPC_TIMEOUT_SENTINEL) {
+                    throw new Error(`rpc executeTransactionBlock timeout after ${timeoutMs}ms`);
+                }
                 this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, txDigest);
             }
             catch (error) {

package/package.json

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