@clonegod/ttd-bsc-send-tx 2.0.4 → 2.0.6

package/.env.example

@@ -0,0 +1,40 @@
+APP_NAME=send-tx
+
+CHAIN_ID=BSC
+
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+
+LOG_LEVEL=INFO
+LOG_DEPTH=4
+
+# WS client（trade 进程连 send-tx server 用）
+SEND_TX_WS_HOST=127.0.0.1
+
+# WS server 开关
+SEND_TX_48CLUB_WS=false
+SEND_TX_BLOXROUTE_WS=false
+
+# HTTP providers
+SEND_TX_DEFAULT_RPC=false
+SEND_TX_BLOCKRAZOR_PRIVATE=false
+SEND_TX_BLOCKRAZOR_BUNDLE=false
+SEND_TX_48CLUB_PRIVATE=false
+SEND_TX_48CLUB_BUNDLE=false
+SEND_TX_BLOX_BUNDLE_WS=false
+SEND_TX_48CLUB_BUNDLE_WS=false
+
+# Builder endpoints
+BSC_RPC_ENDPOINT=
+BLOXROUTE_WS_URL=
+BLOX_AUTH_KEY=
+_48CLUB_WS_URL=
+_48CLUB_RPC_URL=
+_48CLUB_SP_WALLET_ID=TTD-PAYMENT
+BLOCKRAZOR_RPC_URL=
+BLOCKRAZOR_AUTH_TOKEN=
+
+# 间接依赖（通过 ttd-core 工具函数读取）
+# load_wallet
+WALLET_DIR=
+ENCRYPTION_KEY=

package/dist/_48club/http.js

@@ -14,12 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._48ClubTrade = void 0;
 const axios_1 = __importDefault(require("axios"));
+const appconfig_1 = require("../appconfig");
 const https_1 = __importDefault(require("https"));
 const sp_signature_1 = require("./sp_signature");
 const member_1 = require("./member");
 class _48ClubTrade {
     constructor() {
-        const rpcUrl = process.env._48CLUB_RPC_URL || 'https://puissant-builder.48.club/';
+        const rpcUrl = appconfig_1.envArgs._48club_rpc_url;
         this.client = axios_1.default.create({
             baseURL: rpcUrl,
             headers: { 'Content-Type': 'application/json' },

package/dist/_48club/member.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.get_48club_sp_private_key = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("../appconfig");
 var _48club_sp_wallet_private_key = null;
 const get_48club_sp_private_key = () => {
     if (_48club_sp_wallet_private_key) {
         return _48club_sp_wallet_private_key;
     }
     try {
-        const wallet = (0, ttd_core_1.load_wallet)(process.env._48CLUB_SP_WALLET_ID || 'TTD-PAYMENT', false);
+        const wallet = (0, ttd_core_1.load_wallet)(appconfig_1.envArgs._48club_sp_wallet_id, false);
         console.log('Load 48club SP wallet success, wallet address:', wallet.public_key);
         _48club_sp_wallet_private_key = wallet.private_key;
         return _48club_sp_wallet_private_key;

package/dist/_48club/ws.js

@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._48ClubWsSender = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("../appconfig");
 class _48ClubWsSender {
     constructor() {
         this.wsClient = null;
-        this.wsUrl = process.env._48CLUB_WS_URL || 'wss://puissant-builder.48.club/';
+        this.wsUrl = appconfig_1.envArgs._48club_ws_url;
     }
     connect() {
         var _a;
@@ -36,11 +37,11 @@ class _48ClubWsSender {
     sendTransaction(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isConnected()) {
-                (0, ttd_core_1.log_warn)('[48club-ws] not connected');
+                (0, ttd_core_1.log_error)('[48club-ws] not connected, dropping tx', new Error('48club not connected'));
                 return;
             }
             if (!request.tipTx) {
-                (0, ttd_core_1.log_warn)('[48club-ws] tipTx required for bundle');
+                (0, ttd_core_1.log_error)('[48club-ws] tipTx required for bundle, dropping tx', new Error('tipTx required for bundle'));
                 return;
             }
             const currentTimestamp = Math.floor(Date.now() / 1000);

package/dist/appconfig/EnvArgs.d.ts

@@ -0,0 +1,24 @@
+import { EnvArgs as CoreEnvArgs } from '@clonegod/ttd-core/dist';
+import './env_registry';
+export declare class SendTxEnvArgs extends CoreEnvArgs {
+    rpc_endpoint: string;
+    wallet_dir: string;
+    encryption_key: string;
+    send_tx_ws_host: string;
+    send_tx_default_rpc: boolean;
+    send_tx_blockrazor_private: boolean;
+    send_tx_48club_private: boolean;
+    send_tx_blockrazor_bundle: boolean;
+    send_tx_48club_bundle: boolean;
+    send_tx_48club_bundle_ws: boolean;
+    send_tx_blox_bundle_ws: boolean;
+    bsc_rpc_endpoint: string;
+    bloxroute_ws_url: string;
+    blox_auth_key: string;
+    _48club_ws_url: string;
+    _48club_rpc_url: string;
+    _48club_sp_wallet_id: string;
+    blockrazor_rpc_url: string;
+    blockrazor_auth_token: string;
+    constructor();
+}

package/dist/appconfig/EnvArgs.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendTxEnvArgs = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+require("./env_registry");
+class SendTxEnvArgs extends dist_1.EnvArgs {
+    constructor() {
+        var _a, _b;
+        super();
+        const cfg = this._cfg;
+        this.app_name = (cfg.app_name || '').toLowerCase();
+        this.chain_id = (cfg.chain_id || '').toUpperCase();
+        this.server_id = (_a = cfg.server_id) !== null && _a !== void 0 ? _a : '';
+        this.redis_host = cfg.redis_host;
+        this.redis_port = String(cfg.redis_port);
+        this.rpc_endpoint = cfg.rpc_endpoint;
+        this.wallet_dir = cfg.wallet_dir;
+        this.encryption_key = (_b = cfg.encryption_key) !== null && _b !== void 0 ? _b : '';
+        this.send_tx_ws_host = cfg.send_tx_ws_host;
+        this.send_tx_default_rpc = cfg.send_tx_default_rpc;
+        this.send_tx_blockrazor_private = cfg.send_tx_blockrazor_private;
+        this.send_tx_48club_private = cfg.send_tx_48club_private;
+        this.send_tx_blockrazor_bundle = cfg.send_tx_blockrazor_bundle;
+        this.send_tx_48club_bundle = cfg.send_tx_48club_bundle;
+        this.send_tx_48club_bundle_ws = cfg.send_tx_48club_bundle_ws;
+        this.send_tx_blox_bundle_ws = cfg.send_tx_blox_bundle_ws;
+        this.bsc_rpc_endpoint = cfg.bsc_rpc_endpoint;
+        this.bloxroute_ws_url = cfg.bloxroute_ws_url;
+        this.blox_auth_key = cfg.blox_auth_key;
+        this._48club_ws_url = cfg._48club_ws_url;
+        this._48club_rpc_url = cfg._48club_rpc_url;
+        this._48club_sp_wallet_id = cfg._48club_sp_wallet_id;
+        this.blockrazor_rpc_url = cfg.blockrazor_rpc_url;
+        this.blockrazor_auth_token = cfg.blockrazor_auth_token;
+        (0, dist_1.printEnvConfig)('send-tx', this);
+    }
+}
+exports.SendTxEnvArgs = SendTxEnvArgs;

package/dist/appconfig/env_registry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/appconfig/env_registry.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ttd_core_1 = require("@clonegod/ttd-core");
+(0, ttd_core_1.registerEnvVars)({
+    bloxroute_ws_url: { env: 'BLOXROUTE_WS_URL', type: 'string', default: 'wss://api.blxrbdn.com/ws', desc: 'BloxRoute WS URL（send-tx 上游）' },
+    blox_auth_key: { env: 'BLOX_AUTH_KEY', type: 'string', default: '', sensitive: true, desc: 'BloxRoute 认证 key（send-tx 上游）' },
+    _48club_ws_url: { env: '_48CLUB_WS_URL', type: 'string', default: 'wss://puissant-builder.48.club/', desc: '48Club WS URL（send-tx 上游）' },
+});

package/dist/appconfig/index.d.ts

@@ -0,0 +1,3 @@
+import { SendTxEnvArgs } from './EnvArgs';
+export { SendTxEnvArgs };
+export declare const envArgs: SendTxEnvArgs;

package/dist/appconfig/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.envArgs = exports.SendTxEnvArgs = void 0;
+const EnvArgs_1 = require("./EnvArgs");
+Object.defineProperty(exports, "SendTxEnvArgs", { enumerable: true, get: function () { return EnvArgs_1.SendTxEnvArgs; } });
+exports.envArgs = new EnvArgs_1.SendTxEnvArgs();

package/dist/blockrazor/index.js

@@ -14,12 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockRazorTrade = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("../appconfig");
 const axios_1 = __importDefault(require("axios"));
 const https_1 = __importDefault(require("https"));
 class BlockRazorTrade {
     constructor() {
-        const rpcUrl = process.env.BLOCKRAZOR_RPC_URL || 'https://rpc.blockrazor.builders';
-        const authToken = process.env.BLOCKRAZOR_AUTH_TOKEN || '';
+        const rpcUrl = appconfig_1.envArgs.blockrazor_rpc_url;
+        const authToken = appconfig_1.envArgs.blockrazor_auth_token;
         this.client = axios_1.default.create({
             baseURL: rpcUrl,
             headers: { 'Content-Type': 'application/json', 'Authorization': authToken },

package/dist/bloxroute/ws.js

@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BloXRouteWsSender = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("../appconfig");
 class BloXRouteWsSender {
     constructor() {
         this.wsClient = null;
-        this.wsUrl = process.env.BLOXROUTE_WS_URL || 'wss://api.blxrbdn.com/ws';
-        this.authToken = process.env.BLOX_AUTH_KEY || '';
+        this.wsUrl = appconfig_1.envArgs.bloxroute_ws_url;
+        this.authToken = appconfig_1.envArgs.blox_auth_key;
     }
     connect() {
         var _a;
@@ -40,11 +41,11 @@ class BloXRouteWsSender {
     sendTransaction(request) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isConnected()) {
-                (0, ttd_core_1.log_warn)('[bloxroute-ws] not connected');
+                (0, ttd_core_1.log_error)('[bloxroute-ws] not connected, dropping tx', new Error('bloxroute not connected'));
                 return;
             }
             if (!request.tipTx) {
-                (0, ttd_core_1.log_warn)('[bloxroute-ws] tipTx required for bundle');
+                (0, ttd_core_1.log_error)('[bloxroute-ws] tipTx required for bundle, dropping tx', new Error('tipTx required for bundle'));
                 return;
             }
             const targetBlockNumber = request.blockNumber + 4;

package/dist/rpc/index.js

@@ -11,9 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BscMainnetRpc = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("../appconfig");
 class BscMainnetRpc {
     constructor(rpc_endpoint) {
-        this.url = rpc_endpoint || process.env.BSC_RPC_ENDPOINT || '';
+        this.url = rpc_endpoint || appconfig_1.envArgs.bsc_rpc_endpoint;
         this.headers = new Headers();
         this.headers.append("Content-Type", "application/json");
     }

package/dist/transaction_sender.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionSender = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("./appconfig");
 const rpc_1 = require("./rpc");
 const blockrazor_1 = require("./blockrazor");
 const _48club_1 = require("./_48club");
@@ -29,7 +30,7 @@ class TransactionSender {
         return __awaiter(this, arguments, void 0, function* (signedMainTx, tipTxMap, order_trace_id, pair = '', only_bundle = false, trace) {
             const results = [];
             const errors = [];
-            if (process.env.SEND_TX_BLOX_BUNDLE_WS === 'true') {
+            if (appconfig_1.envArgs.send_tx_blox_bundle_ws) {
                 try {
                     const tipTx = tipTxMap.get(constants_1.BSC_EOA_ADDRESS.BLXR);
                     this.sendBundleProxy.sendTransaction('bloxroute', pair, signedMainTx, tipTx);
@@ -40,7 +41,7 @@ class TransactionSender {
                     (0, ttd_core_1.log_info)(`Transaction send failed`, { provider: 'bloxroute_ws', order_trace_id, error: error.message });
                 }
             }
-            if (process.env.SEND_TX_48CLUB_BUNDLE_WS === 'true') {
+            if (appconfig_1.envArgs.send_tx_48club_bundle_ws) {
                 try {
                     const tipTx = tipTxMap.get(constants_1.BSC_EOA_ADDRESS._48CLUB);
                     let spSignature;
@@ -63,19 +64,19 @@ class TransactionSender {
             const httpProviders = [
                 {
                     name: 'default_rpc',
-                    enable: process.env.SEND_TX_DEFAULT_RPC_PRIVATE === 'true',
+                    enable: appconfig_1.envArgs.send_tx_default_rpc,
                     is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () { return this.rpc.eth_sendRawTransaction(signedMainTx); }),
                 },
                 {
                     name: 'blockrazor_private',
-                    enable: process.env.SEND_TX_BLOCKRAZOR_PRIVATE === 'true',
+                    enable: appconfig_1.envArgs.send_tx_blockrazor_private,
                     is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () { return this.blockRazor.sendPrivateTransaction(signedMainTx); }),
                 },
                 {
                     name: 'blockrazor_bundle',
-                    enable: process.env.SEND_TX_BLOCKRAZOR_BUNDLE === 'true',
+                    enable: appconfig_1.envArgs.send_tx_blockrazor_bundle,
                     is_bundle: true,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         const tipTx = tipTxMap.get(constants_1.BSC_EOA_ADDRESS.BLOCKRAZOR);
@@ -84,13 +85,13 @@ class TransactionSender {
                 },
                 {
                     name: '48club_private',
-                    enable: process.env.SEND_TX_48CLUB_PRIVATE === 'true',
+                    enable: appconfig_1.envArgs.send_tx_48club_private,
                     is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () { return this._48Club.sendPrivateTransactionWith48SP(signedMainTx); }),
                 },
                 {
                     name: '48club_bundle',
-                    enable: process.env.SEND_TX_48CLUB_BUNDLE === 'true',
+                    enable: appconfig_1.envArgs.send_tx_48club_bundle,
                     is_bundle: true,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         const tipTx = tipTxMap.get(constants_1.BSC_EOA_ADDRESS._48CLUB);
@@ -111,16 +112,16 @@ class TransactionSender {
                     (0, ttd_core_1.log_info)(`Transaction send failed`, { provider: provider.name, order_trace_id, error: error.message });
                 }
             })));
-            if (errors.some(e => e.includes('nonce'))) {
-                throw new Error(`Nonce error: ${JSON.stringify(errors)}`);
+            if (results.length > 0) {
+                return results;
             }
             if (errors.some(e => e.includes('bundle already exist') || e.includes('already known'))) {
                 return results;
             }
-            if (results.length === 0 || errors.length > 0) {
-                throw new Error(`Send failed: ${JSON.stringify(errors)}`);
+            if (errors.some(e => e.includes('nonce'))) {
+                throw new Error(`Nonce error: ${JSON.stringify(errors)}`);
             }
-            return results;
+            throw new Error(`Send failed: ${JSON.stringify(errors)}`);
         });
     }
 }

package/dist/ws_client.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BscSendTxProxy = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("./appconfig");
 const logger = (0, ttd_core_1.createLogger)(__filename);
 class BscSendTxProxy {
     constructor() {
         this.connected = false;
         this.pendingQueue = [];
-        const host = process.env.SEND_TX_WS_HOST || '127.0.0.1';
+        const host = appconfig_1.envArgs.send_tx_ws_host;
         this.wsUrl = `ws://${host}:${ttd_core_1.SERVICE_PORT.SEND_TX_WS}/bsc/send_tx`;
         this.clientName = process.env.APP_NAME
             || process.env.name

package/dist/ws_server.js

@@ -11,6 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 require('dotenv').config();
 const ttd_core_1 = require("@clonegod/ttd-core");
+const appconfig_1 = require("./appconfig");
+(0, ttd_core_1.setCoreEnv)(appconfig_1.envArgs);
 const ws_1 = require("ws");
 const _48club_1 = require("./_48club");
 const bloxroute_1 = require("./bloxroute");
@@ -35,13 +37,28 @@ class BscSendTxWebSocketServer {
         this.initSenders();
     }
     initSenders() {
-        if (process.env.SEND_TX_48CLUB_WS === 'true') {
-            this._48clubWsSender = new _48club_1._48ClubWsSender();
-            this._48clubWsSender.connect();
+        if (appconfig_1.envArgs._48club_ws_url) {
+            try {
+                this._48clubWsSender = new _48club_1._48ClubWsSender();
+                this._48clubWsSender.connect();
+                (0, ttd_core_1.log_info)(`[WS_SERVER] 48Club upstream WS client started → ${appconfig_1.envArgs._48club_ws_url}`);
+            }
+            catch (e) {
+                (0, ttd_core_1.log_error)('[WS_SERVER] 48Club upstream init failed', e instanceof Error ? e : new Error(String(e)));
+            }
+        }
+        if (appconfig_1.envArgs.bloxroute_ws_url && appconfig_1.envArgs.blox_auth_key) {
+            try {
+                this.bloxrouteWsSender = new bloxroute_1.BloXRouteWsSender();
+                this.bloxrouteWsSender.connect();
+                (0, ttd_core_1.log_info)(`[WS_SERVER] BloxRoute upstream WS client started → ${appconfig_1.envArgs.bloxroute_ws_url}`);
+            }
+            catch (e) {
+                (0, ttd_core_1.log_error)('[WS_SERVER] BloxRoute upstream init failed', e instanceof Error ? e : new Error(String(e)));
+            }
         }
-        if (process.env.SEND_TX_BLOXROUTE_WS === 'true') {
-            this.bloxrouteWsSender = new bloxroute_1.BloXRouteWsSender();
-            this.bloxrouteWsSender.connect();
+        else if (appconfig_1.envArgs.bloxroute_ws_url && !appconfig_1.envArgs.blox_auth_key) {
+            (0, ttd_core_1.log_info)(`[WS_SERVER] BloxRoute upstream skipped: BLOX_AUTH_KEY 未配置`);
         }
     }
     handleMessage(ws, message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-send-tx",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "BSC 交易发送模块（HTTP直发 + WS bundle 转发）",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -12,8 +12,8 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.0.13",
-    "axios": "^1.12.0",
+    "@clonegod/ttd-core": "3.1.53",
+    "axios": "1.15.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0",
     "ws": "^8.18.3"