@clonegod/ttd-sui-common 1.0.28 → 1.0.30

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) => void;
+    send_tx: (signedTxBytes: string, signature: string, txDigest: string) => Promise<void>;
 }

package/dist/trade/send_tx/index.js

@@ -1,45 +1,45 @@
 "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.SuiTxSender = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 class SuiTxSender {
     constructor(appConfig, sui_client, grpcClient) {
-        this.send_tx = (signedTxBytes, signature, txDigest) => {
-            const promises = [];
+        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');
-            const grpcPromise = this.grpcClient.transactionService.executeTransaction(bcsBytes, signatureBytes)
-                .then((response) => { return { type: 'grpc', success: true, response }; })
-                .catch((error) => {
-                (0, dist_1.log_error)(`submit tx to grpc failed`, error);
-                return { type: 'grpc', success: false, error };
-            });
-            promises.push(grpcPromise);
-            const rpcPromise = this.sui_client.executeTransactionBlock({
-                transactionBlock: signedTxBytes,
-                signature: signature,
-                options: {
-                    showEvents: true,
-                    showBalanceChanges: true,
-                    showObjectChanges: true,
-                    showEffects: true
+            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)(`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);
                 }
-            }).then((response) => {
-                return { type: 'rpc', success: true, response };
-            }).catch((error) => {
-                (0, dist_1.log_error)(`submit tx to sui_client failed`, error);
-                return { type: 'rpc', success: false, error };
-            });
-            promises.push(rpcPromise);
-            Promise.race(promises).then((result) => {
-                if (result.type === 'rpc') {
-                    this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, txDigest);
+                catch (error) {
+                    (0, dist_1.log_error)(`send tx by grpc failed!!! txid=${txDigest}`, error);
                 }
-                if (result.type === 'grpc') {
-                    this.appConfig.emit(`SUI_TX_RESULT_${txDigest}`, result.response);
-                }
-            });
-        };
+            }
+        });
         this.appConfig = appConfig;
         this.sui_client = sui_client;
         this.grpcClient = grpcClient;

package/package.json

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