@clonegod/ttd-bsc-common 3.0.26 → 3.0.28

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from './types';
 export * from './utils';
 export * from './redis';
 export * from './ws';
+export * from './send-tx';

package/dist/index.js

@@ -22,3 +22,4 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./redis"), exports);
 __exportStar(require("./ws"), exports);
+__exportStar(require("./send-tx"), exports);

package/dist/send-tx/constants.d.ts

@@ -0,0 +1,5 @@
+export declare enum BSC_EOA_ADDRESS {
+    BLOCKRAZOR = "0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20",
+    _48CLUB = "0x4848489f0b2BEdd788c696e2D79b6b69D7484848",
+    BLXR = "0x74c5F8C6ffe41AD4789602BDB9a48E6Cad623520"
+}

package/dist/send-tx/constants.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BSC_EOA_ADDRESS = void 0;
+var BSC_EOA_ADDRESS;
+(function (BSC_EOA_ADDRESS) {
+    BSC_EOA_ADDRESS["BLOCKRAZOR"] = "0x1266C6bE60392A8Ff346E8d5ECCd3E69dD9c5F20";
+    BSC_EOA_ADDRESS["_48CLUB"] = "0x4848489f0b2BEdd788c696e2D79b6b69D7484848";
+    BSC_EOA_ADDRESS["BLXR"] = "0x74c5F8C6ffe41AD4789602BDB9a48E6Cad623520";
+})(BSC_EOA_ADDRESS || (exports.BSC_EOA_ADDRESS = BSC_EOA_ADDRESS = {}));

package/dist/send-tx/index.d.ts

@@ -0,0 +1,2 @@
+export * from './types';
+export * from './constants';

package/dist/send-tx/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./types"), exports);
+__exportStar(require("./constants"), exports);

package/dist/send-tx/types.d.ts

@@ -0,0 +1,3 @@
+export interface ITransactionSender {
+    sendTransaction(signedMainTx: string, eoa_tip_transaction: (eoa_address: string) => Promise<string>, order_trace_id: string, pair?: string, only_bundle?: boolean): Promise<string[]>;
+}

package/dist/send-tx/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/trade/abstract_dex_trade.d.ts

@@ -2,7 +2,7 @@ import { AbastrcatTrade, AppConfig, TradeContext } from '@clonegod/ttd-core';
 import { ethers } from "ethers";
 import { EvmChainConfig } from "../types";
 import { CallerManager } from "./caller_manager";
-import { TransactionSender } from "@clonegod/ttd-bsc-send-tx";
+import { ITransactionSender } from "../send-tx";
 import { SimpleRedisClient } from "../redis";
 export interface TradeConfig {
     vaultAddress: string;
@@ -17,7 +17,7 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     protected appConfig: AppConfig;
     protected callerManager: CallerManager;
     protected provider: any;
-    protected transactionSender: TransactionSender;
+    protected transactionSender: ITransactionSender;
     protected chainConfig: EvmChainConfig;
     protected redisClient: SimpleRedisClient;
     protected tradeConfig: TradeConfig;
@@ -26,7 +26,7 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     constructor(appConfig: AppConfig);
     protected abstract initConfigs(): void;
     abstract encodeTradeData(context: TradeContext): TradeCalldata;
-    init(): Promise<void>;
+    init(transactionSender?: ITransactionSender): Promise<void>;
     execute(context: TradeContext): Promise<string>;
     protected getGasPriceGwei(context: TradeContext): string;
     protected getBuilderTipAmoutGwei(context: TradeContext): string;

package/dist/trade/abstract_dex_trade.js

@@ -16,7 +16,8 @@ exports.AbstractDexTrade = void 0;
 exports.buildTradeConfig = buildTradeConfig;
 const ttd_core_1 = require("@clonegod/ttd-core");
 const caller_manager_1 = require("./caller_manager");
-const ttd_bsc_send_tx_1 = require("@clonegod/ttd-bsc-send-tx");
+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");
@@ -52,10 +53,12 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
         this.redisClient = new redis_1.SimpleRedisClient(`${this.chainNameLower}:tx`);
         this.vaultInterface = new ethers_compat_1.ethersCompat.Interface(VAULT_ABI);
     }
-    init() {
+    init(transactionSender) {
         return __awaiter(this, void 0, void 0, function* () {
             this.provider = new ethers_compat_1.ethersCompat.JsonRpcProvider(this.chainConfig.rpcEndpoint);
-            this.transactionSender = new ttd_bsc_send_tx_1.TransactionSender(this.appConfig);
+            if (transactionSender) {
+                this.transactionSender = transactionSender;
+            }
             const defaultCallerId = `${this.chainNameLower.toUpperCase()}-CALLER`;
             const callerGroupIds = (process.env.CALLER_GROUP_IDS || defaultCallerId).trim().split(',').filter(Boolean);
             this.callerManager = new caller_manager_1.CallerManager({
@@ -112,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,
@@ -122,9 +124,9 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                         value: 0,
                     };
                     const builderAddresses = [
-                        ttd_bsc_send_tx_1.BSC_EOA_ADDRESS.BLOCKRAZOR,
-                        ttd_bsc_send_tx_1.BSC_EOA_ADDRESS._48CLUB,
-                        ttd_bsc_send_tx_1.BSC_EOA_ADDRESS.BLXR,
+                        send_tx_1.BSC_EOA_ADDRESS.BLOCKRAZOR,
+                        send_tx_1.BSC_EOA_ADDRESS._48CLUB,
+                        send_tx_1.BSC_EOA_ADDRESS.BLXR,
                     ];
                     const [rawMainTx, ...rawTips] = yield Promise.all([
                         caller.signTransaction(mainTx),
@@ -146,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) {
@@ -197,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.26",
+  "version": "3.0.28",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@clonegod/ttd-core": "3.0.8",
-    "@clonegod/ttd-bsc-send-tx": "1.0.1",
+    "@clonegod/ttd-bsc-send-tx": "2.0.3",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0"