@clonegod/ttd-bsc-common 1.0.64 → 1.0.66

package/dist/trade/abstract_dex_trade_plus.d.ts

@@ -36,6 +36,7 @@ export declare abstract class AbstractEvmDexTradePlus extends AbastrcatTrade {
     abstract execute(context: TradeContext, retryCount?: number): Promise<string>;
     protected buildTipTransferTx(to: string, transfer_amount_gwei: string, gas_price_gwei: string, transfer_nonce: number, wallet: ethers.Wallet): Promise<string>;
     protected chooseWallet(context: TradeContext): Promise<ethers.Wallet>;
+    protected getWalletNextNonce(walletAddress: string): Promise<any>;
     protected determineInputOutputTokens(order_msg: any, pool_info: any): {
         inputToken: any;
         outputToken: any;

package/dist/trade/abstract_dex_trade_plus.js

@@ -412,6 +412,22 @@ 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);
+                if (!wallet_assets) {
+                    return 0;
+                }
+                const wallet_assets_map = JSON.parse(wallet_assets);
+                return wallet_assets_map.nonce;
+            }
+            catch (error) {
+                console.warn(`获取钱包下一个nonce失败: ${walletAddress}`, error);
+                return 0;
+            }
+        });
+    }
     determineInputOutputTokens(order_msg, pool_info) {
         const { aToB } = order_msg;
         const { tokenA, tokenB, quote_token } = pool_info;

package/dist/trade/parse/base_parser.js

@@ -49,10 +49,11 @@ class BaseTxParser {
                     ? ethers_1.ethers.BigNumber.from(txReceipt.gasUsed)
                     : txReceipt.gasUsed)
                 : ethers_1.ethers.BigNumber.from(0);
-            const effectiveGasPrice = txReceipt.effectiveGasPrice
-                ? (typeof txReceipt.effectiveGasPrice === 'string' || typeof txReceipt.effectiveGasPrice === 'number'
-                    ? ethers_1.ethers.BigNumber.from(txReceipt.effectiveGasPrice)
-                    : txReceipt.effectiveGasPrice)
+            const gasPriceValue = txReceipt.effectiveGasPrice || txReceipt.gasPrice;
+            const effectiveGasPrice = gasPriceValue
+                ? (typeof gasPriceValue === 'string' || typeof gasPriceValue === 'number'
+                    ? ethers_1.ethers.BigNumber.from(gasPriceValue)
+                    : gasPriceValue)
                 : ethers_1.ethers.BigNumber.from(0);
             const gasFeeBN = gasUsed.mul(effectiveGasPrice);
             const base_fee = Number(ethers_1.ethers.utils.formatEther(gasFeeBN));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "1.0.64",
+  "version": "1.0.66",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "2.0.89",
+    "@clonegod/ttd-core": "2.0.90",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0"