@clonegod/ttd-bsc-common 3.0.27 → 3.0.28

package/dist/trade/abstract_dex_trade.js

@@ -17,6 +17,7 @@ exports.buildTradeConfig = buildTradeConfig;
 const ttd_core_1 = require("@clonegod/ttd-core");
 const caller_manager_1 = require("./caller_manager");
 const send_tx_1 = require("../send-tx");
+const base_tx_result_checker_1 = require("./check/base_tx_result_checker");
 const redis_1 = require("../redis");
 const trade_direction_1 = require("../utils/trade_direction");
 const ethers_compat_1 = require("../utils/ethers_compat");
@@ -114,7 +115,6 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                     const transfer_amount_gwei = this.getBuilderTipAmoutGwei(context);
                     context.ui_tip_amount = new decimal_js_1.default(transfer_amount_gwei).div(Math.pow(10, 9)).toNumber();
                     const mainTx = {
-                        type: 0,
                         to: this.tradeConfig.vaultAddress,
                         data: vaultCalldata,
                         gasLimit: this.chainConfig.gasOptions.gasLimit,
@@ -148,6 +148,10 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                         pair, direction: isBuy ? 'BUY' : 'SELL',
                         txid, attempt: i, caller: caller.address
                     }, order_trace_id);
+                    try {
+                        base_tx_result_checker_1.TradeResultSubscriber.getInstance().sendNonceWatch(caller.address, txid);
+                    }
+                    catch (_b) { }
                     return txid;
                 }
                 catch (error) {
@@ -199,8 +203,6 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             const real_transfer_amount_gwei = Math.min(Number(transfer_amount_gwei), this.chainConfig.gasOptions.maxTipAmountGwei).toString();
             const real_gas_price_gwei = Math.min(Number(gas_price_gwei), this.chainConfig.gasOptions.maxGasPriceGwei).toString();
             const tx_data = {
-                type: 0,
-                from: wallet.address,
                 to,
                 value: ethers_compat_1.ethersCompat.parseUnits(real_transfer_amount_gwei, 'gwei'),
                 gasLimit: 21000,

package/dist/trade/check/base_tx_result_checker.d.ts

@@ -1,6 +1,17 @@
 import { EnvArgs } from '@clonegod/ttd-core';
 import { AbstractTransactionResultCheck } from "@clonegod/ttd-core/dist/trade";
 import { EventEmitter } from 'events';
+export declare class TradeResultSubscriber {
+    private static instance;
+    private ws;
+    private connected;
+    private listeners;
+    static getInstance(): TradeResultSubscriber;
+    listen(txHash: string, callback: (receipt: any) => void, timeoutMs?: number): void;
+    remove(txHash: string): void;
+    sendNonceWatch(caller: string, txHash: string): void;
+    private ensureConnected;
+}
 export declare abstract class BaseTxResultChecker extends AbstractTransactionResultCheck {
     protected provider: any;
     constructor(env_args: EnvArgs, event_emitter: EventEmitter);

package/dist/trade/check/base_tx_result_checker.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTxResultChecker = void 0;
+exports.BaseTxResultChecker = exports.TradeResultSubscriber = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
 const trade_1 = require("@clonegod/ttd-core/dist/trade");
 const ethers_compat_1 = require("../../utils/ethers_compat");
@@ -36,6 +36,12 @@ class TradeResultSubscriber {
     remove(txHash) {
         this.listeners.delete(txHash.toLowerCase());
     }
+    sendNonceWatch(caller, txHash) {
+        this.ensureConnected();
+        if (this.ws && this.connected) {
+            this.ws.send(JSON.stringify({ type: 'nonceWatch', caller, txHash }));
+        }
+    }
     ensureConnected() {
         if (this.ws && this.connected)
             return;
@@ -69,6 +75,7 @@ class TradeResultSubscriber {
         this.ws.connect();
     }
 }
+exports.TradeResultSubscriber = TradeResultSubscriber;
 TradeResultSubscriber.instance = null;
 class BaseTxResultChecker extends trade_1.AbstractTransactionResultCheck {
     constructor(env_args, event_emitter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.27",
+  "version": "3.0.28",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@clonegod/ttd-core": "3.0.8",
+    "@clonegod/ttd-bsc-send-tx": "2.0.3",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0"