hermes-swap 0.0.31 → 0.0.32

package/dist/esm/index.js

@@ -1,5 +1,13 @@
+var _excluded = ["gasLimit"],
+  _excluded2 = ["gasLimit"],
+  _excluded3 = ["gasLimit"],
+  _excluded4 = ["gasPrice"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -16,8 +24,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType } from "./types.js";
-import { ethers } from 'ethers';
-import { Contract } from 'ethers';
+import { ethers, Contract } from 'ethers';
 import QuoterAbi from "./abis/quoter.js";
 import AggregatorAbi from "./abis/aggregator.js";
 
@@ -117,27 +124,50 @@ var Hermes = /*#__PURE__*/function () {
     key: "swap",
     value: function () {
       var _swap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var fromTokenAddress, toTokenAddress, aggregatorAddress, wallet, aggregator, swapParams, erc20, userBalance, currentAllowance, gas, txResponse, receipt, iface, amountOut, _iterator, _step, log, parsed;
+        var txReq,
+          fromTokenAddress,
+          toTokenAddress,
+          aggregatorAddress,
+          wallet,
+          aggregator,
+          swapParams,
+          erc20,
+          userBalance,
+          currentAllowance,
+          estimateGas,
+          _txReq,
+          _ignore,
+          estimationOverrides,
+          txResponse,
+          receipt,
+          iface,
+          amountOut,
+          _iterator,
+          _step,
+          log,
+          parsed,
+          _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              txReq = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
               this.validateParams(params);
               if (params.path.length) {
-                _context2.next = 3;
+                _context2.next = 4;
                 break;
               }
               throw new Error('Swap path not provided');
-            case 3:
+            case 4:
               fromTokenAddress = params.path[0].fromCoinAddress;
               toTokenAddress = params.path[params.path.length - 1].toCoinAddress;
               aggregatorAddress = this.getAggregatorAddress(params.chain);
               wallet = this.walletMap.get(params.chain);
               if (wallet) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
               throw new Error("Wallet not configured for chain: ".concat(params.chain));
-            case 9:
+            case 10:
               aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet);
               swapParams = params.path.map(function (pathItem) {
                 var _pathItem$extra;
@@ -150,104 +180,107 @@ var Hermes = /*#__PURE__*/function () {
                 };
               });
               erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], wallet);
-              _context2.next = 14;
+              _context2.next = 15;
               return erc20.balanceOf(params.user);
-            case 14:
+            case 15:
               userBalance = _context2.sent;
               if (!(userBalance < params.amountInWei)) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
               throw new Error('Insufficient balance for swap');
-            case 17:
-              _context2.next = 19;
+            case 18:
+              _context2.next = 20;
               return erc20.allowance(params.user, aggregatorAddress);
-            case 19:
+            case 20:
               currentAllowance = _context2.sent;
               if (!(currentAllowance < params.amountInWei)) {
-                _context2.next = 22;
+                _context2.next = 23;
                 break;
               }
               throw new Error('Insufficient allowance token amount for swap');
-            case 22:
-              _context2.prev = 22;
-              _context2.next = 25;
-              return aggregator.getFunction('swap').estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
-                from: wallet.address
-              });
-            case 25:
-              gas = _context2.sent;
-              _context2.next = 32;
+            case 23:
+              _txReq = txReq, _ignore = _txReq.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq, _excluded);
+              _context2.prev = 24;
+              _context2.next = 27;
+              return aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
+            case 27:
+              estimateGas = _context2.sent;
+              _context2.next = 34;
               break;
-            case 28:
-              _context2.prev = 28;
-              _context2.t0 = _context2["catch"](22);
+            case 30:
+              _context2.prev = 30;
+              _context2.t0 = _context2["catch"](24);
               console.warn('Aggregator estimateGas.swap failed', _context2.t0);
               throw _context2.t0;
-            case 32:
-              _context2.prev = 32;
-              _context2.next = 35;
-              return aggregator.getFunction('swap')(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
-                from: wallet.address
-              });
-            case 35:
+            case 34:
+              txReq = this.resolveGasLimit(txReq, estimateGas);
+              _context2.next = 37;
+              return this.resolveNonce(wallet.provider, wallet.address, txReq);
+            case 37:
+              txReq = _context2.sent;
+              _context2.next = 40;
+              return this.resolvePricing(wallet.provider, txReq);
+            case 40:
+              txReq = _context2.sent;
+              _context2.next = 43;
+              return aggregator.swap(params.user, params.amountInWei, swapParams, params.minAmountOutList, txReq);
+            case 43:
               txResponse = _context2.sent;
-              _context2.next = 42;
-              break;
-            case 38:
-              _context2.prev = 38;
-              _context2.t1 = _context2["catch"](32);
-              console.error('Aggregator swap transaction failed', _context2.t1);
-              throw _context2.t1;
-            case 42:
-              _context2.next = 44;
+              _context2.next = 46;
               return txResponse.wait();
-            case 44:
+            case 46:
               receipt = _context2.sent;
               iface = new ethers.Interface(AggregatorAbi);
-              amountOut = params.amountInWei;
+              amountOut = null;
               _iterator = _createForOfIteratorHelper(receipt.logs);
-              _context2.prev = 48;
+              _context2.prev = 50;
               _iterator.s();
-            case 50:
+            case 52:
               if ((_step = _iterator.n()).done) {
-                _context2.next = 64;
+                _context2.next = 66;
                 break;
               }
               log = _step.value;
               if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
-                _context2.next = 62;
+                _context2.next = 64;
                 break;
               }
-              _context2.prev = 53;
+              _context2.prev = 55;
               parsed = iface.parseLog(log);
               if (!(parsed && parsed.name === 'Swapped' && parsed.args && parsed.args.amountOut !== undefined)) {
-                _context2.next = 58;
+                _context2.next = 60;
                 break;
               }
               amountOut = parsed.args.amountOut;
-              return _context2.abrupt("break", 64);
-            case 58:
-              _context2.next = 62;
-              break;
+              return _context2.abrupt("break", 66);
             case 60:
-              _context2.prev = 60;
-              _context2.t2 = _context2["catch"](53);
-            case 62:
-              _context2.next = 50;
+              _context2.next = 64;
               break;
+            case 62:
+              _context2.prev = 62;
+              _context2.t1 = _context2["catch"](55);
             case 64:
-              _context2.next = 69;
+              _context2.next = 52;
               break;
             case 66:
-              _context2.prev = 66;
-              _context2.t3 = _context2["catch"](48);
-              _iterator.e(_context2.t3);
-            case 69:
-              _context2.prev = 69;
+              _context2.next = 71;
+              break;
+            case 68:
+              _context2.prev = 68;
+              _context2.t2 = _context2["catch"](50);
+              _iterator.e(_context2.t2);
+            case 71:
+              _context2.prev = 71;
               _iterator.f();
-              return _context2.finish(69);
-            case 72:
+              return _context2.finish(71);
+            case 74:
+              if (amountOut) {
+                _context2.next = 76;
+                break;
+              }
+              throw new Error("Swapped event not found: ".concat(receipt.hash));
+            case 76:
               return _context2.abrupt("return", {
                 fromToken: fromTokenAddress,
                 toToken: toTokenAddress,
@@ -257,11 +290,11 @@ var Hermes = /*#__PURE__*/function () {
                 to: receipt.from,
                 logs: receipt.logs
               });
-            case 73:
+            case 77:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[22, 28], [32, 38], [48, 66, 69, 72], [53, 60]]);
+        }, _callee2, this, [[24, 30], [50, 68, 71, 74], [55, 62]]);
       }));
       function swap(_x2) {
         return _swap.apply(this, arguments);
@@ -307,49 +340,63 @@ var Hermes = /*#__PURE__*/function () {
     value: function () {
       var _bridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
         var _params$extra;
-        var aggregatorAddress, wallet, provider, nativeBalance, aggregator, bridgeArgs, txOverrides, txResponse, receipt;
+        var txReq,
+          aggregatorAddress,
+          wallet,
+          provider,
+          nativeBalance,
+          aggregator,
+          bridgeArgs,
+          estimateGas,
+          _txReq2,
+          _ignore,
+          estimationOverrides,
+          response,
+          txReceipt,
+          _args3 = arguments;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              txReq = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
               this.validateParams(params);
 
               // set up
               aggregatorAddress = this.getAggregatorAddress(params.chain);
               wallet = this.walletMap.get(params.chain);
               if (wallet) {
-                _context3.next = 5;
+                _context3.next = 6;
                 break;
               }
               throw new Error("Wallet not configured for chain: ".concat(params.chain));
-            case 5:
+            case 6:
               if (!(params.tokenAddress && params.tokenAddress !== ethers.ZeroAddress)) {
-                _context3.next = 8;
+                _context3.next = 9;
                 break;
               }
-              _context3.next = 8;
+              _context3.next = 9;
               return this.checkIsEnoughToken(params.tokenAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
-            case 8:
+            case 9:
               if (!(params.bridgeFee > 0n)) {
-                _context3.next = 17;
+                _context3.next = 18;
                 break;
               }
               provider = this.providerMap.get(params.chain);
               if (provider) {
-                _context3.next = 12;
+                _context3.next = 13;
                 break;
               }
               throw new Error("Provider not configured for chain: ".concat(params.chain));
-            case 12:
-              _context3.next = 14;
+            case 13:
+              _context3.next = 15;
               return provider.getBalance(params.user);
-            case 14:
+            case 15:
               nativeBalance = _context3.sent;
               if (!(nativeBalance < params.bridgeFee)) {
-                _context3.next = 17;
+                _context3.next = 18;
                 break;
               }
               throw new Error('Insufficient native balance for bridge fee');
-            case 17:
+            case 18:
               aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet); // simulate
               bridgeArgs = {
                 bridge: params.bridgeType,
@@ -360,50 +407,59 @@ var Hermes = /*#__PURE__*/function () {
                 destUser: params.destUser,
                 extra: (_params$extra = params.extra) !== null && _params$extra !== void 0 ? _params$extra : '0x'
               };
-              txOverrides = {
-                from: wallet.address,
-                value: params.bridgeFee
-              }; // simulate
-              _context3.prev = 20;
-              _context3.next = 23;
-              return aggregator.bridge.estimateGas(params.user, bridgeArgs, txOverrides);
-            case 23:
-              _context3.next = 29;
-              break;
+              if (txReq.value == null) {
+                txReq = _objectSpread(_objectSpread({}, txReq), {}, {
+                  value: params.bridgeFee
+                });
+              }
+
+              // simulate
+              _txReq2 = txReq, _ignore = _txReq2.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq2, _excluded2);
+              _context3.prev = 22;
+              _context3.next = 25;
+              return aggregator.bridge.estimateGas(params.user, bridgeArgs, estimationOverrides);
             case 25:
-              _context3.prev = 25;
-              _context3.t0 = _context3["catch"](20);
+              estimateGas = _context3.sent;
+              _context3.next = 32;
+              break;
+            case 28:
+              _context3.prev = 28;
+              _context3.t0 = _context3["catch"](22);
               console.error('Bridge gas estimation reverted', _context3.t0);
               throw _context3.t0;
-            case 29:
-              _context3.prev = 29;
-              _context3.next = 32;
-              return aggregator.bridge(params.user, bridgeArgs, txOverrides);
             case 32:
-              txResponse = _context3.sent;
-              _context3.next = 39;
-              break;
+              // 构造tx req
+              txReq = this.resolveGasLimit(txReq, estimateGas);
+              _context3.next = 35;
+              return this.resolveNonce(wallet.provider, wallet.address, txReq);
             case 35:
-              _context3.prev = 35;
-              _context3.t1 = _context3["catch"](29);
-              console.error('Aggregator swap transaction failed', _context3.t1);
-              throw _context3.t1;
-            case 39:
-              receipt = {
+              txReq = _context3.sent;
+              _context3.next = 38;
+              return this.resolvePricing(wallet.provider, txReq);
+            case 38:
+              txReq = _context3.sent;
+              _context3.next = 41;
+              return aggregator.bridge(params.user, bridgeArgs, txReq);
+            case 41:
+              response = _context3.sent;
+              _context3.next = 44;
+              return response.wait();
+            case 44:
+              txReceipt = _context3.sent;
+              return _context3.abrupt("return", {
                 fromToken: params.tokenAddress,
                 toToken: params.tokenAddress,
                 amountOut: params.amountInWei,
-                hash: txResponse.hash,
-                from: txResponse.from,
-                to: txResponse.to,
-                logs: txResponse.logs
-              };
-              return _context3.abrupt("return", Promise.resolve(receipt));
-            case 41:
+                hash: txReceipt.hash,
+                from: txReceipt.from,
+                to: txReceipt.to,
+                logs: txReceipt.logs
+              });
+            case 46:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[20, 25], [29, 35]]);
+        }, _callee3, this, [[22, 28]]);
       }));
       function bridge(_x3) {
         return _bridge.apply(this, arguments);
@@ -467,29 +523,49 @@ var Hermes = /*#__PURE__*/function () {
     value: function () {
       var _swapAndBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
         var _params$extra3;
-        var aggregatorAddress, wallet, fromCoinAddress, swapParams, bridgeArgs, txOverrides, aggregator, txResponse, receipt;
+        var txReq,
+          aggregatorAddress,
+          wallet,
+          fromCoinAddress,
+          swapParams,
+          bridgeArgs,
+          _txReq3,
+          _ignore,
+          estimationOverrides,
+          aggregator,
+          estimateGas,
+          response,
+          txReceipt,
+          iface,
+          outputAmountWei,
+          _iterator2,
+          _step2,
+          log,
+          parsed,
+          _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              txReq = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
               this.validateParams(params);
 
               // call the aggregator swap and bridge
               aggregatorAddress = this.getAggregatorAddress(params.chain);
               wallet = this.walletMap.get(params.chain);
               if (wallet) {
-                _context5.next = 5;
+                _context5.next = 6;
                 break;
               }
               throw new Error("Wallet not configured for chain: ".concat(params.chain));
-            case 5:
+            case 6:
               fromCoinAddress = params.path[0].fromCoinAddress;
               if (!(fromCoinAddress && fromCoinAddress !== ethers.ZeroAddress)) {
-                _context5.next = 9;
+                _context5.next = 10;
                 break;
               }
-              _context5.next = 9;
+              _context5.next = 10;
               return this.checkIsEnoughToken(fromCoinAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
-            case 9:
+            case 10:
               // 准备合约参数
               swapParams = params.path.map(function (pathItem) {
                 var _pathItem$extra3;
@@ -510,51 +586,99 @@ var Hermes = /*#__PURE__*/function () {
                 destUser: params.destUser,
                 extra: (_params$extra3 = params.extra) !== null && _params$extra3 !== void 0 ? _params$extra3 : '0x'
               };
-              txOverrides = {
-                from: wallet.address,
-                value: params.bridgeFee
-              }; // simulate
+              if (txReq.value == null) {
+                txReq = _objectSpread(_objectSpread({}, txReq), {}, {
+                  value: params.bridgeFee
+                });
+              }
+              _txReq3 = txReq, _ignore = _txReq3.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq3, _excluded3);
               aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet);
-              _context5.prev = 13;
-              _context5.next = 16;
-              return aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
-            case 16:
-              _context5.next = 22;
+              _context5.next = 17;
+              return aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, estimationOverrides);
+            case 17:
+              estimateGas = _context5.sent;
+              txReq = this.resolveGasLimit(txReq, estimateGas);
+              _context5.next = 21;
+              return this.resolveNonce(wallet.provider, wallet.address, txReq);
+            case 21:
+              txReq = _context5.sent;
+              _context5.next = 24;
+              return this.resolvePricing(wallet.provider, txReq);
+            case 24:
+              txReq = _context5.sent;
+              _context5.next = 27;
+              return aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txReq);
+            case 27:
+              response = _context5.sent;
+              _context5.next = 30;
+              return response.wait();
+            case 30:
+              txReceipt = _context5.sent;
+              // 解析 SwapAndBridge 事件
+              iface = new ethers.Interface(AggregatorAbi);
+              outputAmountWei = null;
+              _iterator2 = _createForOfIteratorHelper(txReceipt.logs);
+              _context5.prev = 34;
+              _iterator2.s();
+            case 36:
+              if ((_step2 = _iterator2.n()).done) {
+                _context5.next = 50;
+                break;
+              }
+              log = _step2.value;
+              if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
+                _context5.next = 48;
+                break;
+              }
+              _context5.prev = 39;
+              parsed = iface.parseLog(log);
+              if (!(parsed && parsed.name === 'SwapAndBridge' && parsed.args && parsed.args.amountOut !== undefined)) {
+                _context5.next = 44;
+                break;
+              }
+              outputAmountWei = parsed.args.amountOut;
+              return _context5.abrupt("break", 50);
+            case 44:
+              _context5.next = 48;
               break;
-            case 18:
-              _context5.prev = 18;
-              _context5.t0 = _context5["catch"](13);
-              console.error('Bridge gas estimation reverted', _context5.t0);
-              throw _context5.t0;
-            case 22:
-              _context5.prev = 22;
-              _context5.next = 25;
-              return aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
-            case 25:
-              txResponse = _context5.sent;
-              _context5.next = 32;
+            case 46:
+              _context5.prev = 46;
+              _context5.t0 = _context5["catch"](39);
+            case 48:
+              _context5.next = 36;
               break;
-            case 28:
-              _context5.prev = 28;
-              _context5.t1 = _context5["catch"](22);
-              console.error('Aggregator swap and bridge transaction failed', _context5.t1);
-              throw _context5.t1;
-            case 32:
-              receipt = {
+            case 50:
+              _context5.next = 55;
+              break;
+            case 52:
+              _context5.prev = 52;
+              _context5.t1 = _context5["catch"](34);
+              _iterator2.e(_context5.t1);
+            case 55:
+              _context5.prev = 55;
+              _iterator2.f();
+              return _context5.finish(55);
+            case 58:
+              if (outputAmountWei) {
+                _context5.next = 60;
+                break;
+              }
+              throw new Error("SwapAndBridge event not found: ".concat(txReceipt.hash));
+            case 60:
+              return _context5.abrupt("return", {
                 fromToken: params.path[0].fromCoinAddress,
                 toToken: params.path[params.path.length - 1].toCoinAddress,
-                amountOut: params.minAmountOutList[params.minAmountOutList.length - 1],
-                hash: txResponse.hash,
-                from: txResponse.from,
-                to: txResponse.to,
-                logs: txResponse.logs
-              };
-              return _context5.abrupt("return", Promise.resolve(receipt));
-            case 34:
+                amountOut: outputAmountWei,
+                hash: txReceipt.hash,
+                from: txReceipt.from,
+                to: txReceipt.to,
+                logs: txReceipt.logs
+              });
+            case 61:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[13, 18], [22, 28]]);
+        }, _callee5, this, [[34, 52, 55, 58], [39, 46]]);
       }));
       function swapAndBridge(_x5) {
         return _swapAndBridge.apply(this, arguments);
@@ -875,41 +999,141 @@ var Hermes = /*#__PURE__*/function () {
       };
     }
   }, {
-    key: "checkIsEnoughToken",
+    key: "resolveGasLimit",
+    value: function resolveGasLimit(txReq, estimateGas) {
+      if (txReq.gasLimit != null) {
+        return txReq;
+      }
+      return _objectSpread(_objectSpread({}, txReq), {}, {
+        gasLimit: estimateGas * 130n / 100n // 上浮30%
+      });
+    }
+  }, {
+    key: "resolveNonce",
     value: function () {
-      var _checkIsEnoughToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(fromTokenAddress, userAddress, amountInWei, aggregatorAddress, wallet) {
-        var erc20, userBalance, currentAllowance;
+      var _resolveNonce = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(provider, from, tx) {
+        var nonce;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
+            case 0:
+              if (!(tx.nonce != null)) {
+                _context11.next = 2;
+                break;
+              }
+              return _context11.abrupt("return", tx);
+            case 2:
+              _context11.next = 4;
+              return provider.getTransactionCount(from, 'latest');
+            case 4:
+              nonce = _context11.sent;
+              return _context11.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
+                nonce: nonce
+              }));
+            case 6:
+            case "end":
+              return _context11.stop();
+          }
+        }, _callee11);
+      }));
+      function resolveNonce(_x14, _x15, _x16) {
+        return _resolveNonce.apply(this, arguments);
+      }
+      return resolveNonce;
+    }()
+  }, {
+    key: "resolvePricing",
+    value: function () {
+      var _resolvePricing = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(provider, tx) {
+        var fd;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              if (!(tx.gasPrice != null || tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null)) {
+                _context12.next = 2;
+                break;
+              }
+              return _context12.abrupt("return", this.sanitizePricing(tx));
+            case 2:
+              _context12.next = 4;
+              return provider.getFeeData();
+            case 4:
+              fd = _context12.sent;
+              if (!(fd.maxFeePerGas != null && fd.maxPriorityFeePerGas != null)) {
+                _context12.next = 7;
+                break;
+              }
+              return _context12.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
+                maxFeePerGas: fd.maxFeePerGas * 150n / 100n,
+                // 上浮50%
+                maxPriorityFeePerGas: fd.maxPriorityFeePerGas
+              }));
+            case 7:
+              if (!(fd.gasPrice != null)) {
+                _context12.next = 9;
+                break;
+              }
+              return _context12.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
+                gasPrice: fd.gasPrice
+              }));
+            case 9:
+              return _context12.abrupt("return", tx);
+            case 10:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12, this);
+      }));
+      function resolvePricing(_x17, _x18) {
+        return _resolvePricing.apply(this, arguments);
+      }
+      return resolvePricing;
+    }()
+  }, {
+    key: "sanitizePricing",
+    value: function sanitizePricing(tx) {
+      // If user supplied any EIP-1559 field, remove legacy gasPrice to avoid mixing.
+      if (tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null) {
+        var gasPrice = tx.gasPrice,
+          rest = _objectWithoutProperties(tx, _excluded4);
+        return rest;
+      }
+      return tx;
+    }
+  }, {
+    key: "checkIsEnoughToken",
+    value: function () {
+      var _checkIsEnoughToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(fromTokenAddress, userAddress, amountInWei, aggregatorAddress, wallet) {
+        var erc20, userBalance, currentAllowance;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
               erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], wallet);
-              _context11.next = 3;
+              _context13.next = 3;
               return erc20.balanceOf(userAddress);
             case 3:
-              userBalance = _context11.sent;
+              userBalance = _context13.sent;
               if (!(userBalance < amountInWei)) {
-                _context11.next = 6;
+                _context13.next = 6;
                 break;
               }
               throw new Error('Insufficient balance token amount');
             case 6:
-              _context11.next = 8;
+              _context13.next = 8;
               return erc20.allowance(userAddress, aggregatorAddress);
             case 8:
-              currentAllowance = _context11.sent;
-              console.log(currentAllowance);
+              currentAllowance = _context13.sent;
               if (!(currentAllowance < amountInWei)) {
-                _context11.next = 12;
+                _context13.next = 11;
                 break;
               }
               throw new Error('Insufficient allowance token amount');
-            case 12:
+            case 11:
             case "end":
-              return _context11.stop();
+              return _context13.stop();
           }
-        }, _callee11);
+        }, _callee13);
       }));
-      function checkIsEnoughToken(_x14, _x15, _x16, _x17, _x18) {
+      function checkIsEnoughToken(_x19, _x20, _x21, _x22, _x23) {
         return _checkIsEnoughToken.apply(this, arguments);
       }
       return checkIsEnoughToken;