@clonegod/ttd-bsc-common 1.0.66 → 1.0.68

package/dist/trade/abstract_dex_trade_plus.js

@@ -415,7 +415,7 @@ class AbstractEvmDexTradePlus extends dist_1.AbastrcatTrade {
     getWalletNextNonce(walletAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const wallet_assets = yield this.redisClient.hgetvalue(`${this.chainNameLower}:wallet:assets`, walletAddress);
+                const wallet_assets = yield this.redisClient.hgetvalue(`${this.chainNameLower}:wallet:assets`, walletAddress.toLowerCase());
                 if (!wallet_assets) {
                     return 0;
                 }

package/dist/trade/send/48club.d.ts

@@ -9,9 +9,9 @@ export interface BundleParams {
 }
 export declare class _48ClubTrade {
     private rpcUrl;
-    private soulPointSignature?;
-    constructor(soulPointSignature?: string);
+    constructor();
     sendPrivateTransaction(signedTx: string): Promise<string>;
-    _sendPrivateTransactionWith48SP(signedTx: string): Promise<string>;
+    get48SPSignature(txs: string[]): Promise<string>;
+    sendPrivateTransactionWith48SP(signedTx: string): Promise<string>;
     sendBundle(params: BundleParams): Promise<string>;
 }

package/dist/trade/send/48club.js

@@ -14,11 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._48ClubTrade = exports._48CLUB_BUILDER_CONTROL_EOA = void 0;
 const axios_1 = __importDefault(require("axios"));
+const _48club_sp_1 = require("./48club_sp");
+const _48club_member_1 = require("./48club_member");
 exports._48CLUB_BUILDER_CONTROL_EOA = '0x4848489f0b2BEdd788c696e2D79b6b69D7484848';
 class _48ClubTrade {
-    constructor(soulPointSignature) {
+    constructor() {
         this.rpcUrl = process.env._48CLUB_RPC_URL || 'https://puissant-builder.48.club/';
-        this.soulPointSignature = soulPointSignature;
     }
     sendPrivateTransaction(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -42,17 +43,28 @@ class _48ClubTrade {
             }
         });
     }
-    _sendPrivateTransactionWith48SP(signedTx) {
+    get48SPSignature(txs) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spPrivateKey = (0, _48club_member_1.get_48club_sp_private_key)();
+            if (!spPrivateKey) {
+                throw new Error('48 SoulPoint private key is required. Please set _48CLUB_SP_WALLET_ID environment variable.');
+            }
+            return _48club_sp_1.SoulPointSignature.generate48SPSignature(spPrivateKey, txs);
+        });
+    }
+    sendPrivateTransactionWith48SP(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (!this.soulPointSignature) {
-                    throw new Error('48 SoulPoint signature is required');
+                const spPrivateKey = (0, _48club_member_1.get_48club_sp_private_key)();
+                if (!spPrivateKey) {
+                    throw new Error('48 SoulPoint private key is required. Please set _48CLUB_SP_WALLET_ID environment variable.');
                 }
+                const spSignature = _48club_sp_1.SoulPointSignature.generate48SPSignature(spPrivateKey, [signedTx]);
                 const response = yield axios_1.default.post(this.rpcUrl, {
                     jsonrpc: "2.0",
                     id: "1",
                     method: "eth_sendPrivateTransactionWith48SP",
-                    params: [signedTx, this.soulPointSignature]
+                    params: [signedTx, spSignature]
                 });
                 if (response.data.error) {
                     throw new Error(`RPC Error: ${response.data.error.message}`);
@@ -71,7 +83,24 @@ class _48ClubTrade {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const currentTimestamp = Math.floor(Date.now() / 1000);
-                const requestParams = Object.assign({ txs: params.txs, maxBlockNumber: params.maxBlockNumber, maxTimestamp: params.maxTimestamp || currentTimestamp + 30, revertingTxHashes: params.revertingTxHashes, noMerge: params.noMerge, backrunTarget: params.backrunTarget }, (this.soulPointSignature ? { '48spSign': this.soulPointSignature } : {}));
+                const requestParams = {
+                    txs: params.txs,
+                    maxBlockNumber: params.maxBlockNumber,
+                    maxTimestamp: params.maxTimestamp || currentTimestamp + 30,
+                    revertingTxHashes: params.revertingTxHashes,
+                    noMerge: params.noMerge,
+                    backrunTarget: params.backrunTarget,
+                };
+                const spPrivateKey = (0, _48club_member_1.get_48club_sp_private_key)();
+                if (spPrivateKey) {
+                    try {
+                        const spSignature = _48club_sp_1.SoulPointSignature.generate48SPSignature(spPrivateKey, params.txs);
+                        requestParams['48spSign'] = spSignature;
+                    }
+                    catch (error) {
+                        console.warn(`[48CLUB] 生成 48SP 签名失败，将发送不带签名的 Bundle: ${error.message}`);
+                    }
+                }
                 const response = yield axios_1.default.post(this.rpcUrl, {
                     jsonrpc: "2.0",
                     id: "1",

package/dist/trade/send/48club_member.d.ts

@@ -0,0 +1 @@
+export declare const get_48club_sp_private_key: () => string | null;

package/dist/trade/send/48club_member.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_48club_sp_private_key = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+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, dist_1.load_wallet)(process.env._48CLUB_SP_WALLET_ID || 'TTD-PAYMENT');
+        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;
+    }
+    catch (error) {
+        console.error('Load 48club SP wallet failed:' + error.message);
+        return null;
+    }
+};
+exports.get_48club_sp_private_key = get_48club_sp_private_key;

package/dist/trade/send/48club_sp.js

@@ -24,7 +24,10 @@ class SoulPointSignature {
             const concatenatedHashes = ethers_1.ethers.utils.concat(txHashes);
             const messageHash = ethers_1.ethers.utils.keccak256(concatenatedHashes);
             const signature = wallet._signingKey().signDigest(messageHash);
-            return signature.compact;
+            const r = signature.r.slice(2).padStart(64, '0');
+            const s = signature.s.slice(2).padStart(64, '0');
+            const v = signature.recoveryParam.toString(16).padStart(2, '0');
+            return '0x' + r + s + v;
         }
         catch (error) {
             throw new Error(`生成48 SoulPoint签名失败: ${error}`);

package/dist/trade/send/blxr.d.ts

@@ -1,8 +0,0 @@
-export declare class BlxrTradeProxy {
-    private wsUrl;
-    private authToken;
-    private ws;
-    constructor();
-    init(): void;
-    sendTransaction(pair: string, mainTx: string, tipTx: string, blockNumber?: number): void;
-}

package/dist/trade/send/blxr.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlxrTradeProxy = void 0;
-const dist_1 = require("@clonegod/ttd-core/dist");
-class BlxrTradeProxy {
-    constructor() {
-        this.wsUrl = process.env.BLOX_SEND_TX_WS_ENDPOINT || 'ws://127.0.0.1:7002/bsc/send_tx';
-        this.authToken = process.env.BLOX_AUTH_KEY || '';
-        this.init();
-    }
-    init() {
-        this.ws = new dist_1.WebSocketClient(this.wsUrl);
-        this.ws.onOpen(() => {
-            console.log('Blxr ws proxy connected:', this.wsUrl);
-        });
-        this.ws.onMessage((message) => {
-            console.log('Blxr ws proxy received message', message);
-        });
-        this.ws.connect();
-    }
-    sendTransaction(pair, mainTx, tipTx, blockNumber = 0) {
-        this.ws.send(JSON.stringify({
-            pair,
-            mainTx,
-            tipTx,
-            blockNumber
-        }));
-    }
-}
-exports.BlxrTradeProxy = BlxrTradeProxy;

package/dist/trade/send/send_bundle_ws.d.ts

@@ -0,0 +1,7 @@
+export declare class BscSendTxProxy {
+    private wsUrl;
+    private ws;
+    constructor();
+    init(): void;
+    sendTransaction(builder: '48club' | 'bloxroute', pair: string, mainTx: string, tipTx: string, _48spSign?: string): void;
+}

package/dist/trade/send/send_bundle_ws.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BscSendTxProxy = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+class BscSendTxProxy {
+    constructor() {
+        this.wsUrl = process.env.BSC_SEND_BUNDLE_WS_ENDPOINT || 'ws://127.0.0.1:10001/bsc/send_tx';
+        this.init();
+    }
+    init() {
+        this.ws = new dist_1.WebSocketClient(this.wsUrl);
+        this.ws.onOpen(() => {
+            console.log('BscSendTxProxy ws connected:', this.wsUrl);
+        });
+        this.ws.onMessage((message) => {
+            console.log('BscSendTxProxy ws received message', message);
+        });
+        this.ws.connect();
+    }
+    sendTransaction(builder, pair, mainTx, tipTx, _48spSign = null) {
+        this.ws.send(JSON.stringify({
+            builder,
+            pair,
+            mainTx,
+            tipTx,
+            _48spSign
+        }));
+    }
+}
+exports.BscSendTxProxy = BscSendTxProxy;

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

@@ -3,7 +3,7 @@ export declare class TransactionSender {
     private rpc;
     private blockRazor;
     private _48Club;
-    private blxrProxy;
+    private sendBundleProxy;
     constructor(appConfig: AppConfig);
-    sendTransaction(signedMainTx: string, eoa_tip_transaction: (eoa_address: string) => Promise<string>, order_trace_id: string, pair?: string): Promise<string[]>;
+    sendTransaction(signedMainTx: string, eoa_tip_transaction: (eoa_address: string) => Promise<string>, order_trace_id: string, pair?: string, only_bundle?: boolean): Promise<string[]>;
 }

package/dist/trade/send/send_tx.js

@@ -15,67 +15,84 @@ const blockrazor_1 = require("./blockrazor");
 const bsc_rpc_1 = require("./bsc_rpc");
 const _48club_1 = require("./48club");
 const _1 = require(".");
-const blxr_1 = require("./blxr");
+const send_bundle_ws_1 = require("./send_bundle_ws");
 class TransactionSender {
     constructor(appConfig) {
         this.rpc = new bsc_rpc_1.BscMainnetRpc(appConfig.env_args.rpc_endpoint);
         this.blockRazor = new blockrazor_1.BlockRazorTrade();
         this._48Club = new _48club_1._48ClubTrade();
-        this.blxrProxy = new blxr_1.BlxrTradeProxy();
+        this.sendBundleProxy = new send_bundle_ws_1.BscSendTxProxy();
     }
     sendTransaction(signedMainTx_1, eoa_tip_transaction_1, order_trace_id_1) {
-        return __awaiter(this, arguments, void 0, function* (signedMainTx, eoa_tip_transaction, order_trace_id, pair = '') {
+        return __awaiter(this, arguments, void 0, function* (signedMainTx, eoa_tip_transaction, order_trace_id, pair = '', only_bundle = false) {
             const rpcProviders = [
                 {
                     name: 'Default (QuickNode / Merkle)',
                     enable: process.env.SEND_TX_DEFAULT_RPC_PRIVATE === 'true',
+                    is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         return yield this.rpc.eth_sendRawTransaction(signedMainTx);
                     })
                 },
                 {
-                    name: 'BlockRazor - Private Transaction',
+                    name: 'BlockRazor HTTP - Private Transaction',
                     enable: process.env.SEND_TX_BLOCKRAZOR_PRIVATE === 'true',
+                    is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         return yield this.blockRazor.sendPrivateTransaction(signedMainTx);
                     })
                 },
                 {
-                    name: 'BlockRazor - sendBundle',
+                    name: 'BlockRazor HTTP - sendBundle',
                     enable: process.env.SEND_TX_BLOCKRAZOR_BUNDLE === 'true',
+                    is_bundle: true,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         let bundle = [signedMainTx, yield eoa_tip_transaction(_1.BSC_EOA_ADDRESS.BLOCKRAZOR)];
                         return yield this.blockRazor.sendBundle(bundle);
                     })
                 },
                 {
-                    name: '48Club - Private Transaction',
+                    name: '48Club - HTTP - Private Transaction With 48SP',
                     enable: process.env.SEND_TX_48CLUB_PRIVATE === 'true',
+                    is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () {
-                        return yield this._48Club.sendPrivateTransaction(signedMainTx);
+                        return yield this._48Club.sendPrivateTransactionWith48SP(signedMainTx);
                     })
                 },
                 {
-                    name: '48Club - sendBundle',
+                    name: '48Club - HTTP - sendBundle',
                     enable: process.env.SEND_TX_48CLUB_BUNDLE === 'true',
+                    is_bundle: true,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         let bundle = [signedMainTx, yield eoa_tip_transaction(_1.BSC_EOA_ADDRESS._48CLUB)];
                         return yield this._48Club.sendBundle({ txs: bundle });
                     })
                 },
                 {
-                    name: 'Blxr - sendTransaction',
-                    enable: process.env.SEND_TX_BLXR === 'true',
+                    name: '48Club - WS - sendBundle',
+                    enable: process.env.SEND_TX_48CLUB_BUNDLE_WS === 'true',
+                    is_bundle: true,
                     send: () => __awaiter(this, void 0, void 0, function* () {
                         const tipTx = yield eoa_tip_transaction(_1.BSC_EOA_ADDRESS.BLXR);
-                        this.blxrProxy.sendTransaction(pair, signedMainTx, tipTx);
-                        return Promise.resolve('success');
+                        const spSignature = yield this._48Club.get48SPSignature([signedMainTx, tipTx]);
+                        this.sendBundleProxy.sendTransaction('48club', pair, signedMainTx, tipTx, spSignature);
+                        return Promise.resolve('send bundle to 48club ws proxy success');
                     })
-                }
+                },
+                {
+                    name: 'BloxRoute - WS - sendBundle',
+                    enable: process.env.SEND_TX_BLOX_BUNDLE_WS === 'true',
+                    is_bundle: true,
+                    send: () => __awaiter(this, void 0, void 0, function* () {
+                        const tipTx = yield eoa_tip_transaction(_1.BSC_EOA_ADDRESS.BLXR);
+                        this.sendBundleProxy.sendTransaction('bloxroute', pair, signedMainTx, tipTx);
+                        return Promise.resolve('send bundle to bloxroute ws proxy success');
+                    })
+                },
             ];
             const results = [];
             const errors = [];
-            yield Promise.all(rpcProviders.filter(provider => provider.enable).map((provider) => __awaiter(this, void 0, void 0, function* () {
+            yield Promise.all(rpcProviders.filter(provider => provider.enable).filter(provider => only_bundle ? provider.is_bundle : true).map((provider) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const txHash = yield provider.send();
                     results.push(txHash);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",