@clonegod/ttd-bsc-send-tx 2.0.2 → 2.0.3

package/dist/_48club/http.d.ts

@@ -1,6 +1,7 @@
 export declare class _48ClubTrade {
     private rpcUrl;
     constructor();
+    sendPrivateTransaction(signedTx: string): Promise<string>;
     sendPrivateTransactionWith48SP(signedTx: string): Promise<string>;
     sendBundle(params: {
         txs: string[];

package/dist/_48club/http.js

@@ -18,17 +18,28 @@ const sp_signature_1 = require("./sp_signature");
 const member_1 = require("./member");
 class _48ClubTrade {
     constructor() {
-        this.rpcUrl = process.env._48CLUB_RPC_URL || 'https://puissant-bsc.48.club';
+        this.rpcUrl = process.env._48CLUB_RPC_URL || 'https://puissant-builder.48.club/';
+    }
+    sendPrivateTransaction(signedTx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield axios_1.default.post(this.rpcUrl, {
+                jsonrpc: "2.0", id: "1",
+                method: "eth_sendRawTransaction",
+                params: [signedTx]
+            });
+            if (response.data.error) {
+                throw new Error(`48club private tx: ${response.data.error.message}`);
+            }
+            return response.data.result;
+        });
     }
     sendPrivateTransactionWith48SP(signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
-            const spSign = yield this.get48SPSignature([signedTx]);
+            const spSignature = yield this.get48SPSignature([signedTx]);
             const response = yield axios_1.default.post(this.rpcUrl, {
-                jsonrpc: "2.0", id: 1,
-                method: "eth_sendPrivateTransaction",
-                params: [{ tx: signedTx, preferences: { '48spSign': spSign } }]
-            }, {
-                headers: { 'Content-Type': 'application/json' }
+                jsonrpc: "2.0", id: "1",
+                method: "eth_sendPrivateTransactionWith48SP",
+                params: [signedTx, spSignature]
             });
             if (response.data.error) {
                 throw new Error(`48club private tx: ${response.data.error.message}`);
@@ -39,17 +50,21 @@ class _48ClubTrade {
     sendBundle(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentTimestamp = Math.floor(Date.now() / 1000);
-            const spSign = yield this.get48SPSignature(params.txs);
+            const requestParams = {
+                txs: params.txs,
+                maxTimestamp: currentTimestamp + 2,
+            };
+            try {
+                const spSignature = yield this.get48SPSignature(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,
+                jsonrpc: "2.0", id: "1",
                 method: "eth_sendBundle",
-                params: [{
-                        txs: params.txs,
-                        maxTimestamp: currentTimestamp + 2,
-                        '48spSign': spSign
-                    }]
-            }, {
-                headers: { 'Content-Type': 'application/json' }
+                params: [requestParams]
             });
             if (response.data.error) {
                 throw new Error(`48club bundle: ${response.data.error.message}`);

package/dist/_48club/sp_signature.d.ts

@@ -1,4 +1,6 @@
 export declare class SoulPointSignature {
     static generate48SPSignature(privateKey: string, txs: string[]): string;
+    private static signWithV5;
+    private static signWithV6;
     static verify48SPSignature(signature: string, txs: string[], expectedSignerAddress: string): boolean;
 }

package/dist/_48club/sp_signature.js

@@ -4,30 +4,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SoulPointSignature = void 0;
 const ethers_1 = require("ethers");
 const _ethers = ethers_1.ethers;
-const keccak256 = ((_a = _ethers.utils) === null || _a === void 0 ? void 0 : _a.keccak256) || _ethers.keccak256;
-const concat = ((_b = _ethers.utils) === null || _b === void 0 ? void 0 : _b.concat) || _ethers.concat;
-const recoverAddress = ((_c = _ethers.utils) === null || _c === void 0 ? void 0 : _c.recoverAddress) || _ethers.recoverAddress;
+const keccak256Fn = ((_a = _ethers.utils) === null || _a === void 0 ? void 0 : _a.keccak256) || _ethers.keccak256;
+const concatFn = ((_b = _ethers.utils) === null || _b === void 0 ? void 0 : _b.concat) || _ethers.concat;
+const recoverAddressFn = ((_c = _ethers.utils) === null || _c === void 0 ? void 0 : _c.recoverAddress) || _ethers.recoverAddress;
 class SoulPointSignature {
     static generate48SPSignature(privateKey, txs) {
         const wallet = new ethers_1.ethers.Wallet(privateKey);
-        const txHashes = txs.map(tx => tx.startsWith('0x') ? keccak256(tx) : tx);
-        const concatenatedHashes = concat(txHashes);
-        const messageHash = keccak256(concatenatedHashes);
-        if (typeof wallet._signingKey === 'function') {
-            const signature = wallet._signingKey().signDigest(messageHash);
-            return signature.compact;
+        try {
+            return this.signWithV5(wallet, txs);
+        }
+        catch (_a) {
+            return this.signWithV6(wallet, txs);
+        }
+    }
+    static signWithV5(wallet, txs) {
+        const txHashes = txs.map(tx => tx.startsWith('0x') ? keccak256Fn(tx) : tx);
+        const concatenatedHashes = concatFn(txHashes);
+        const messageHash = keccak256Fn(concatenatedHashes);
+        const signature = wallet._signingKey().signDigest(messageHash);
+        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;
+    }
+    static signWithV6(wallet, txs) {
+        const txHashes = txs.map(tx => tx.startsWith('0x') ? keccak256Fn(tx) : tx);
+        const concatenatedHashes = concatFn(txHashes);
+        const messageHash = keccak256Fn(concatenatedHashes);
+        const signingKey = wallet.signingKey;
+        const signature = signingKey.sign(messageHash);
+        const r = signature.r.slice(2).padStart(64, '0');
+        const s = signature.s.slice(2).padStart(64, '0');
+        let recoveryId;
+        if (signature.recoveryParam !== undefined) {
+            recoveryId = Number(signature.recoveryParam);
+        }
+        else if (signature.v !== undefined) {
+            const v = Number(signature.v);
+            recoveryId = v >= 27 ? v - 27 : v;
         }
         else {
-            const signature = wallet.signingKey.sign(messageHash);
-            return signature.compactSerialized;
+            recoveryId = 0;
         }
+        recoveryId = recoveryId % 2;
+        const v = recoveryId.toString(16).padStart(2, '0');
+        return '0x' + r + s + v;
     }
     static verify48SPSignature(signature, txs, expectedSignerAddress) {
         try {
-            const txHashes = txs.map(tx => tx.startsWith('0x') ? keccak256(tx) : tx);
-            const concatenatedHashes = concat(txHashes);
-            const messageHash = keccak256(concatenatedHashes);
-            const recoveredAddr = recoverAddress(messageHash, signature);
+            const txHashes = txs.map(tx => tx.startsWith('0x') ? keccak256Fn(tx) : tx);
+            const concatenatedHashes = concatFn(txHashes);
+            const messageHash = keccak256Fn(concatenatedHashes);
+            const recoveredAddr = recoverAddressFn(messageHash, signature);
             return recoveredAddr.toLowerCase() === expectedSignerAddress.toLowerCase();
         }
         catch (_a) {

package/dist/transaction_sender.js

@@ -48,7 +48,7 @@ class TransactionSender {
                     }),
                 },
                 {
-                    name: '48Club HTTP Private',
+                    name: '48Club HTTP Private with 48SP',
                     enable: process.env.SEND_TX_48CLUB_PRIVATE === 'true',
                     is_bundle: false,
                     send: () => __awaiter(this, void 0, void 0, function* () { return this._48Club.sendPrivateTransactionWith48SP(signedMainTx); }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-send-tx",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "BSC 交易发送模块（HTTP直发 + WS bundle 转发）",
   "license": "UNLICENSED",
   "main": "dist/index.js",