@clonegod/ttd-sui-common 1.0.29 → 1.0.31

package/dist/trade/check/tx_result_checker.js

@@ -56,18 +56,28 @@ class TransactionResultChecker extends trade_1.AbstractTransactionResultCheck {
         });
     }
     on_subscibe_transaction() {
-        this.event_emitter.once(`SUI_TX_RESULT_${this.txid}`, (response) => {
+        this.event_emitter.once(`SUI_TX_RESULT_${this.txid}`, (response) => __awaiter(this, void 0, void 0, function* () {
             (0, dist_1.log_info)(`receive tx result notification, txid=${this.txid}`);
             if (response.transaction) {
                 this.processTransactionResult(response, 'grpc');
+                return;
             }
-            else {
-                (0, dist_1.log_warn)(`re-fetch tx result by ledgerService, txid=${this.txid}`);
-                this.leadgerService.getTransaction(this.txid, ['*']).then((txReceipt) => {
-                    this.processTransactionResult(txReceipt, 'grpc2');
-                });
+            (0, dist_1.log_warn)(`re-fetch tx result by ledgerService start, txid=${this.txid}`);
+            for (let i = 1; i <= 6; i++) {
+                let txReceipt = null;
+                try {
+                    txReceipt = yield this.leadgerService.getTransaction(this.txid, ['*']);
+                    if (txReceipt) {
+                        this.processTransactionResult(txReceipt, 'grpc2');
+                        break;
+                    }
+                }
+                catch (error) {
+                    (0, dist_1.log_warn)(`re-fetch tx result by ledgerService failed (i=${i}), txid=${this.txid}, error=${error.message}`);
+                }
+                yield (0, dist_1.sleep)(500);
             }
-        });
+        }));
     }
     processTransactionResult(txReceipt, source) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -6,5 +6,5 @@ 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, max_retry?: number) => Promise<void>;
+    send_tx: (signedTxBytes: string, signature: string, txDigest: string) => Promise<void>;
 }

package/dist/trade/send_tx/index.js

@@ -13,42 +13,31 @@ 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, ...args_1) => __awaiter(this, [signedTxBytes_1, signature_1, txDigest_1, ...args_1], void 0, function* (signedTxBytes, signature, txDigest, send_type = 'grpc', max_retry = 3) {
+        this.send_tx = (signedTxBytes, signature, txDigest) => __awaiter(this, void 0, void 0, function* () {
             const bcsBytes = Buffer.from(signedTxBytes, 'base64');
             const signatureBytes = Buffer.from(signature, 'base64');
-            if (send_type.toLowerCase() === 'grpc') {
-                for (let i = 0; i < max_retry; i++) {
-                    try {
-                        let response = yield this.grpcClient.transactionService.executeTransaction(bcsBytes, signatureBytes);
-                        this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, response);
+            try {
+                let _response = yield this.sui_client.executeTransactionBlock({
+                    transactionBlock: signedTxBytes,
+                    signature: signature,
+                    options: {
+                        showEvents: true,
+                        showBalanceChanges: true,
+                        showObjectChanges: true,
+                        showEffects: true
                     }
-                    catch (error) {
-                        (0, dist_1.log_error)(`submit tx to grpc failed`, error);
-                    }
-                }
+                });
+                this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, txDigest);
             }
-            else if (send_type.toLowerCase() === 'rpc') {
-                for (let i = 0; i < max_retry; i++) {
-                    try {
-                        let _response = yield this.sui_client.executeTransactionBlock({
-                            transactionBlock: signedTxBytes,
-                            signature: signature,
-                            options: {
-                                showEvents: true,
-                                showBalanceChanges: true,
-                                showObjectChanges: true,
-                                showEffects: true
-                            }
-                        });
-                        this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, txDigest);
-                    }
-                    catch (error) {
-                        (0, dist_1.log_error)(`submit tx to sui_client failed`, error);
-                    }
+            catch (error) {
+                (0, dist_1.log_error)(`send tx by rpc failed!!! txid=${txDigest}`, error);
+                try {
+                    let response = yield this.grpcClient.transactionService.executeTransaction(bcsBytes, signatureBytes);
+                    this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, response);
+                }
+                catch (error) {
+                    (0, dist_1.log_error)(`send tx by grpc failed!!! txid=${txDigest}`, error);
                 }
-            }
-            else {
-                throw new Error(`not support send type: ${send_type}`);
             }
         });
         this.appConfig = appConfig;

package/package.json

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