hermes-swap 0.6.0 → 0.6.1

package/dist/cjs/aggregator.cjs

@@ -897,7 +897,7 @@ var _Aggregator = class {
         () => _Aggregator.traceLog(chain, "log", `广播${label} OK, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`),
         (err) => {
           const msg = (err == null ? void 0 : err.message) ?? String(err);
-          if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("ALREADY_EXISTS")) {
+          if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("ALREADY_EXISTS") || msg.includes("nonce has already been used")) {
             _Aggregator.traceLog(chain, "log", `广播${label} already known, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
           } else {
             _Aggregator.traceLog(chain, "warn", `广播${label} 失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
@@ -907,8 +907,34 @@ var _Aggregator = class {
     };
     const mainSendTs = Date.now();
     extraUrls.forEach((url, i) => broadcastToExtra(url, i));
-    const txResponse = await provider.broadcastTransaction(signedTx);
-    _Aggregator.traceLog(chain, "log", `广播主RPC已发送, txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms`);
+    let txResponse;
+    try {
+      txResponse = await provider.broadcastTransaction(signedTx);
+      _Aggregator.traceLog(chain, "log", `广播主RPC已发送, txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms`);
+    } catch (err) {
+      const msg = (err == null ? void 0 : err.message) ?? String(err);
+      if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("ALREADY_EXISTS") || msg.includes("nonce has already been used")) {
+        _Aggregator.traceLog(chain, "log", `广播主RPC already known (可能额外RPC已上链), txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms, 开始轮询receipt`);
+        const existingReceipt = await provider.getTransactionReceipt(txHash);
+        if (existingReceipt) {
+          _Aggregator.traceLog(chain, "log", `交易已上链, txHash=${txHash}, blockNumber=${existingReceipt.blockNumber}`);
+          const blockTs2 = await this.getBlockTimestampStr(provider, existingReceipt.blockNumber);
+          _Aggregator.traceLog(
+            chain,
+            "log",
+            `多RPC广播上链确认, txHash=${existingReceipt.hash}, blockNumber=${existingReceipt.blockNumber}, 出块时间=${blockTs2}, gasUsed=${existingReceipt.gasUsed}, 总耗时=${Date.now() - mainSendTs}ms`
+          );
+          return existingReceipt;
+        }
+        txResponse = await provider.getTransaction(txHash);
+        if (!txResponse) {
+          throw new Error(`Transaction not found after broadcast error: ${txHash}`);
+        }
+      } else {
+        _Aggregator.traceLog(chain, "error", `广播主RPC失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms`);
+        throw err;
+      }
+    }
     const receipt = await txResponse.wait();
     if (!receipt)
       throw new Error(`Transaction receipt is null: ${txHash}`);

package/dist/esm/aggregator.mjs

@@ -1818,7 +1818,7 @@ var Aggregator = /*#__PURE__*/function () {
     value: function () {
       var _sendContractTx = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(chain, contract, method, args, txReq) {
         var _method;
-        var extraUrls, _ref5, sendTs, _txResponse, _receipt, singleProvider, _blockTs, wallet, populated, network, signedTx, txHash, provider, currentBlock, broadcastToExtra, mainSendTs, txResponse, receipt, blockTs;
+        var extraUrls, _ref5, sendTs, _txResponse, _receipt, singleProvider, _blockTs, wallet, populated, network, signedTx, txHash, provider, currentBlock, broadcastToExtra, mainSendTs, txResponse, _err$message2, msg, existingReceipt, _blockTs2, receipt, blockTs;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1877,7 +1877,7 @@ var Aggregator = /*#__PURE__*/function () {
                 }, function (err) {
                   var _err$message;
                   var msg = (_err$message = err === null || err === void 0 ? void 0 : err.message) !== null && _err$message !== void 0 ? _err$message : String(err);
-                  if (msg.includes('already known') || msg.includes('nonce too low') || msg.includes('ALREADY_EXISTS')) {
+                  if (msg.includes('already known') || msg.includes('nonce too low') || msg.includes('ALREADY_EXISTS') || msg.includes('nonce has already been used')) {
                     Aggregator.traceLog(chain, 'log', "\u5E7F\u64AD".concat(label, " already known, txHash=").concat(txHash, ", \u8017\u65F6=").concat(Date.now() - sendTs, "ms"));
                   } else {
                     Aggregator.traceLog(chain, 'warn', "\u5E7F\u64AD".concat(label, " \u5931\u8D25: ").concat(msg, ", txHash=").concat(txHash, ", \u8017\u65F6=").concat(Date.now() - sendTs, "ms"));
@@ -1888,32 +1888,77 @@ var Aggregator = /*#__PURE__*/function () {
               extraUrls.forEach(function (url, i) {
                 return broadcastToExtra(url, i);
               });
-              _context16.next = 40;
+              _context16.prev = 38;
+              _context16.next = 41;
               return provider.broadcastTransaction(signedTx);
-            case 40:
+            case 41:
               txResponse = _context16.sent;
               Aggregator.traceLog(chain, 'log', "\u5E7F\u64AD\u4E3BRPC\u5DF2\u53D1\u9001, txHash=".concat(txHash, ", \u8017\u65F6=").concat(Date.now() - mainSendTs, "ms"));
-              _context16.next = 44;
+              _context16.next = 69;
+              break;
+            case 45:
+              _context16.prev = 45;
+              _context16.t0 = _context16["catch"](38);
+              msg = (_err$message2 = _context16.t0 === null || _context16.t0 === void 0 ? void 0 : _context16.t0.message) !== null && _err$message2 !== void 0 ? _err$message2 : String(_context16.t0);
+              if (!(msg.includes('already known') || msg.includes('nonce too low') || msg.includes('ALREADY_EXISTS') || msg.includes('nonce has already been used'))) {
+                _context16.next = 67;
+                break;
+              }
+              Aggregator.traceLog(chain, 'log', "\u5E7F\u64AD\u4E3BRPC already known (\u53EF\u80FD\u989D\u5916RPC\u5DF2\u4E0A\u94FE), txHash=".concat(txHash, ", \u8017\u65F6=").concat(Date.now() - mainSendTs, "ms, \u5F00\u59CB\u8F6E\u8BE2receipt"));
+              // 先尝试直接获取 receipt，如果交易已上链
+              _context16.next = 52;
+              return provider.getTransactionReceipt(txHash);
+            case 52:
+              existingReceipt = _context16.sent;
+              if (!existingReceipt) {
+                _context16.next = 60;
+                break;
+              }
+              Aggregator.traceLog(chain, 'log', "\u4EA4\u6613\u5DF2\u4E0A\u94FE, txHash=".concat(txHash, ", blockNumber=").concat(existingReceipt.blockNumber));
+              _context16.next = 57;
+              return this.getBlockTimestampStr(provider, existingReceipt.blockNumber);
+            case 57:
+              _blockTs2 = _context16.sent;
+              Aggregator.traceLog(chain, 'log', "\u591ARPC\u5E7F\u64AD\u4E0A\u94FE\u786E\u8BA4, txHash=".concat(existingReceipt.hash, ", blockNumber=").concat(existingReceipt.blockNumber, ", \u51FA\u5757\u65F6\u95F4=").concat(_blockTs2, ", gasUsed=").concat(existingReceipt.gasUsed, ", ") + "\u603B\u8017\u65F6=".concat(Date.now() - mainSendTs, "ms"));
+              return _context16.abrupt("return", existingReceipt);
+            case 60:
+              _context16.next = 62;
+              return provider.getTransaction(txHash);
+            case 62:
+              txResponse = _context16.sent;
+              if (txResponse) {
+                _context16.next = 65;
+                break;
+              }
+              throw new Error("Transaction not found after broadcast error: ".concat(txHash));
+            case 65:
+              _context16.next = 69;
+              break;
+            case 67:
+              Aggregator.traceLog(chain, 'error', "\u5E7F\u64AD\u4E3BRPC\u5931\u8D25: ".concat(msg, ", txHash=").concat(txHash, ", \u8017\u65F6=").concat(Date.now() - mainSendTs, "ms"));
+              throw _context16.t0;
+            case 69:
+              _context16.next = 71;
               return txResponse.wait();
-            case 44:
+            case 71:
               receipt = _context16.sent;
               if (receipt) {
-                _context16.next = 47;
+                _context16.next = 74;
                 break;
               }
               throw new Error("Transaction receipt is null: ".concat(txHash));
-            case 47:
-              _context16.next = 49;
+            case 74:
+              _context16.next = 76;
               return this.getBlockTimestampStr(provider, receipt.blockNumber);
-            case 49:
+            case 76:
               blockTs = _context16.sent;
               Aggregator.traceLog(chain, 'log', "\u591ARPC\u5E7F\u64AD\u4E0A\u94FE\u786E\u8BA4, txHash=".concat(receipt.hash, ", blockNumber=").concat(receipt.blockNumber, ", \u51FA\u5757\u65F6\u95F4=").concat(blockTs, ", gasUsed=").concat(receipt.gasUsed, ", ") + "\u603B\u8017\u65F6=".concat(Date.now() - mainSendTs, "ms"));
               return _context16.abrupt("return", receipt);
-            case 52:
+            case 79:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, this);
+        }, _callee16, this, [[38, 45]]);
       }));
       function sendContractTx(_x31, _x32, _x33, _x34, _x35) {
         return _sendContractTx.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-swap",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A TypeScript utility library for swap and bridge",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",