@clonegod/ttd-bsc-common 3.0.33 → 3.0.35

package/dist/trade/caller_manager.js

@@ -27,7 +27,6 @@ class CallerManager {
         return __awaiter(this, void 0, void 0, function* () {
             const walletInfos = (0, dist_1.load_wallet_multi)(this.config.callerGroupIds, false);
             const allWallets = walletInfos.map(info => new ethers_1.ethers.Wallet(info.private_key, this.config.provider));
-            logger.info(`CallerManager: loaded ${allWallets.length} wallets for group ${this.config.groupId}`, allWallets.map(w => w.address));
             const vaultCallersKey = `${this.config.chainName}:${VAULT_CALLERS_KEY}`;
             const rawJson = yield this.redis.hgetvalue(vaultCallersKey, this.config.groupId);
             let allowedAddresses = [];
@@ -39,14 +38,11 @@ class CallerManager {
                     logger.error(`CallerManager: failed to parse vault whitelist for group ${this.config.groupId}`, err);
                 }
             }
+            let skipped = [];
             if (allowedAddresses.length > 0) {
                 const allowedSet = new Set(allowedAddresses.map(a => a.toLowerCase()));
                 this.callers = allWallets.filter(w => allowedSet.has(w.address.toLowerCase()));
-                logger.info(`CallerManager: matched ${this.callers.length} callers with Vault whitelist for group ${this.config.groupId}`, this.callers.map(w => w.address));
-                const skipped = allWallets.filter(w => !allowedSet.has(w.address.toLowerCase()));
-                if (skipped.length > 0) {
-                    logger.warn(`CallerManager: skipped ${skipped.length} wallets not in Vault whitelist`, skipped.map(w => w.address));
-                }
+                skipped = allWallets.filter(w => !allowedSet.has(w.address.toLowerCase()));
             }
             else {
                 this.callers = allWallets;
@@ -55,18 +51,25 @@ class CallerManager {
             if (this.callers.length === 0) {
                 throw new Error('CallerManager: no valid callers after whitelist matching');
             }
-            yield Promise.all(this.callers.map((caller) => __awaiter(this, void 0, void 0, function* () {
-                const address = caller.address.toLowerCase();
-                const nonceKey = this.getNonceRedisKey();
-                const existing = yield this.redis.hgetvalue(nonceKey, address);
-                if (existing === null || existing === undefined) {
-                    logger.warn(`Caller ${caller.address} nonce not found in Redis, stream-trade may not be running`);
+            const nonceKey = this.getNonceRedisKey();
+            const callerAddresses = this.callers.map(c => c.address.toLowerCase());
+            const nonces = yield this.redis.hmget(nonceKey, callerAddresses);
+            const callerSummary = {};
+            let missingNonceCount = 0;
+            this.callers.forEach((caller, i) => {
+                const nonce = nonces[i];
+                if (nonce === null || nonce === undefined) {
+                    callerSummary[caller.address] = 'MISSING';
+                    missingNonceCount++;
                 }
                 else {
-                    logger.info(`Caller ${caller.address} nonce=${existing} (from Redis)`);
+                    callerSummary[caller.address] = `nonce=${nonce}`;
                 }
-            })));
-            logger.info(`CallerManager initialized, ${this.callers.length} active callers`, this.callers.map(w => w.address));
+            });
+            if (missingNonceCount > 0) {
+                logger.warn(`CallerManager: ${missingNonceCount} callers nonce not found in Redis, stream-trade may not be running`);
+            }
+            logger.info(`CallerManager initialized for ${this.config.groupId}: loaded=${allWallets.length}, active=${this.callers.length}, skipped=${skipped.length}`, callerSummary);
         });
     }
     acquireCaller() {

package/dist/utils/fast_signer.js

@@ -1,34 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchEthersV5Signer = patchEthersV5Signer;
-let patched = false;
-function patchEthersV5Signer() {
-    if (patched)
-        return true;
-    let secp;
+let patchedV5 = false;
+let patchedV6 = false;
+function tryRequire(moduleName) {
     try {
-        secp = require('secp256k1');
+        return require(moduleName);
     }
-    catch (err) {
-        console.warn('[fast_signer] secp256k1 native module not found, skipping patch', err);
-        return false;
+    catch (_a) {
+        return null;
     }
-    let SigningKey;
-    let arrayify;
-    let hexZeroPad;
-    let splitSignature;
-    try {
-        const signingKeyModule = require('@ethersproject/signing-key');
-        const bytesModule = require('@ethersproject/bytes');
-        SigningKey = signingKeyModule.SigningKey;
-        arrayify = bytesModule.arrayify;
-        hexZeroPad = bytesModule.hexZeroPad;
-        splitSignature = bytesModule.splitSignature;
-    }
-    catch (err) {
-        console.warn('[fast_signer] @ethersproject/signing-key not found, skipping patch', err);
+}
+function patchEthersV5Signer() {
+    const secp = tryRequire('secp256k1');
+    if (!secp) {
+        console.warn('[fast_signer] secp256k1 native module not found, skipping patch');
         return false;
     }
+    if (patchEthersV5WithSecp(secp))
+        return true;
+    if (patchEthersV6WithSecp(secp))
+        return true;
+    console.log('[fast_signer] no compatible ethers version found, skipping patch');
+    return false;
+}
+function patchEthersV5WithSecp(secp) {
+    if (patchedV5)
+        return true;
+    const signingKeyModule = tryRequire('@ethersproject/signing-key');
+    const bytesModule = tryRequire('@ethersproject/bytes');
+    if (!signingKeyModule || !bytesModule)
+        return false;
+    const { SigningKey } = signingKeyModule;
+    const { arrayify, hexZeroPad, splitSignature } = bytesModule;
     const originalSignDigest = SigningKey.prototype.signDigest;
     SigningKey.prototype.signDigest = function (digest) {
         const privKeyBytes = arrayify(this.privateKey);
@@ -43,11 +47,41 @@ function patchEthersV5Signer() {
             return splitSignature({ recoveryParam: recid, r, s });
         }
         catch (err) {
-            console.warn('[fast_signer] native sign failed, fallback to elliptic.js', err);
+            console.warn('[fast_signer v5] native sign failed, fallback', err);
             return originalSignDigest.call(this, digest);
         }
     };
-    patched = true;
+    patchedV5 = true;
     console.log('[fast_signer] ethers v5 SigningKey patched with native secp256k1');
     return true;
 }
+function patchEthersV6WithSecp(secp) {
+    if (patchedV6)
+        return true;
+    const ethersV6 = tryRequire('ethers');
+    if (!ethersV6 || !ethersV6.SigningKey || !ethersV6.Signature || !ethersV6.getBytes) {
+        return false;
+    }
+    const { SigningKey, Signature, getBytes } = ethersV6;
+    const originalSign = SigningKey.prototype.sign;
+    SigningKey.prototype.sign = function (digest) {
+        const privKeyBytes = getBytes(this.privateKey);
+        const digestBytes = getBytes(digest);
+        if (digestBytes.length !== 32) {
+            return originalSign.call(this, digest);
+        }
+        try {
+            const { signature, recid } = secp.ecdsaSign(digestBytes, privKeyBytes);
+            const r = '0x' + Buffer.from(signature.slice(0, 32)).toString('hex').padStart(64, '0');
+            const s = '0x' + Buffer.from(signature.slice(32, 64)).toString('hex').padStart(64, '0');
+            return Signature.from({ r, s, v: recid ? 0x1c : 0x1b });
+        }
+        catch (err) {
+            console.warn('[fast_signer v6] native sign failed, fallback', err);
+            return originalSign.call(this, digest);
+        }
+    };
+    patchedV6 = true;
+    console.log('[fast_signer] ethers v6 SigningKey patched with native secp256k1');
+    return true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.33",
+  "version": "3.0.35",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.0.12",
+    "@clonegod/ttd-core": "3.0.13",
     "@clonegod/ttd-bsc-send-tx": "2.0.3",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",