hermes-swap 0.1.7 → 0.1.8

package/dist/cjs/index.js

@@ -133,15 +133,6 @@ var Hermes = class {
       toCoin: pathItem.toCoinAddress,
       extra: pathItem.extra ?? "0x"
     }));
-    const erc20 = new import_ethers.Contract(fromTokenAddress, ["function balanceOf(address) view returns (uint256)", "function allowance(address, address) view returns (uint256)"], wallet);
-    const userBalance = await erc20.balanceOf(params.user);
-    if (userBalance < params.amountInWei) {
-      throw new Error("Insufficient balance for swap");
-    }
-    const currentAllowance = await erc20.allowance(params.user, aggregatorAddress);
-    if (currentAllowance < params.amountInWei) {
-      throw new Error("Insufficient allowance token amount for swap");
-    }
     let estimateGas;
     const { gasLimit: _ignore, ...estimationOverrides } = txReq;
     try {
@@ -316,10 +307,6 @@ var Hermes = class {
     if (!wallet) {
       throw new Error(`Wallet not configured for chain: ${params.chain}`);
     }
-    const fromCoinAddress = params.path[0].fromCoinAddress;
-    if (fromCoinAddress && fromCoinAddress !== import_ethers.ethers.ZeroAddress) {
-      await this.checkIsEnoughToken(fromCoinAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
-    }
     const swapParams = params.path.map((pathItem) => ({
       dexType: pathItem.dexType,
       pool: pathItem.poolAddress,

package/dist/esm/index.js

@@ -189,9 +189,6 @@ var Hermes = /*#__PURE__*/function () {
           wallet,
           aggregator,
           swapParams,
-          erc20,
-          userBalance,
-          currentAllowance,
           estimateGas,
           _txReq,
           _ignore,
@@ -237,108 +234,87 @@ var Hermes = /*#__PURE__*/function () {
                   extra: (_pathItem$extra = pathItem.extra) !== null && _pathItem$extra !== void 0 ? _pathItem$extra : '0x'
                 };
               });
-              erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], wallet);
-              _context3.next = 15;
-              return erc20.balanceOf(params.user);
-            case 15:
-              userBalance = _context3.sent;
-              if (!(userBalance < params.amountInWei)) {
-                _context3.next = 18;
-                break;
-              }
-              throw new Error('Insufficient balance for swap');
-            case 18:
-              _context3.next = 20;
-              return erc20.allowance(params.user, aggregatorAddress);
-            case 20:
-              currentAllowance = _context3.sent;
-              if (!(currentAllowance < params.amountInWei)) {
-                _context3.next = 23;
-                break;
-              }
-              throw new Error('Insufficient allowance token amount for swap');
-            case 23:
               _txReq = txReq, _ignore = _txReq.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq, _excluded);
-              _context3.prev = 24;
-              _context3.next = 27;
+              _context3.prev = 13;
+              _context3.next = 16;
               return aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
-            case 27:
+            case 16:
               estimateGas = _context3.sent;
-              _context3.next = 34;
+              _context3.next = 23;
               break;
-            case 30:
-              _context3.prev = 30;
-              _context3.t0 = _context3["catch"](24);
+            case 19:
+              _context3.prev = 19;
+              _context3.t0 = _context3["catch"](13);
               console.warn('Aggregator estimateGas.swap failed', _context3.t0);
               throw _context3.t0;
-            case 34:
+            case 23:
               txReq = this.resolveGasLimit(txReq, estimateGas);
-              _context3.next = 37;
+              _context3.next = 26;
               return this.resolveNonce(wallet.provider, wallet.address, txReq);
-            case 37:
+            case 26:
               txReq = _context3.sent;
-              _context3.next = 40;
+              _context3.next = 29;
               return this.resolvePricing(wallet.provider, txReq);
-            case 40:
+            case 29:
               txReq = _context3.sent;
-              _context3.next = 43;
+              _context3.next = 32;
               return aggregator.swap(params.user, params.amountInWei, swapParams, params.minAmountOutList, txReq);
-            case 43:
+            case 32:
               txResponse = _context3.sent;
-              _context3.next = 46;
+              _context3.next = 35;
               return txResponse.wait();
-            case 46:
+            case 35:
               receipt = _context3.sent;
               iface = new ethers.Interface(AggregatorAbi);
               amountOut = null;
               _iterator = _createForOfIteratorHelper(receipt.logs);
-              _context3.prev = 50;
+              _context3.prev = 39;
               _iterator.s();
-            case 52:
+            case 41:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 66;
+                _context3.next = 55;
                 break;
               }
               log = _step.value;
               if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
-                _context3.next = 64;
+                _context3.next = 53;
                 break;
               }
-              _context3.prev = 55;
+              _context3.prev = 44;
               parsed = iface.parseLog(log);
               if (!(parsed && parsed.name === 'Swapped' && parsed.args && parsed.args.amountOut !== undefined)) {
-                _context3.next = 60;
+                _context3.next = 49;
                 break;
               }
               amountOut = parsed.args.amountOut;
-              return _context3.abrupt("break", 66);
-            case 60:
-              _context3.next = 64;
+              return _context3.abrupt("break", 55);
+            case 49:
+              _context3.next = 53;
               break;
-            case 62:
-              _context3.prev = 62;
-              _context3.t1 = _context3["catch"](55);
-            case 64:
-              _context3.next = 52;
+            case 51:
+              _context3.prev = 51;
+              _context3.t1 = _context3["catch"](44);
+            case 53:
+              _context3.next = 41;
               break;
-            case 66:
-              _context3.next = 71;
+            case 55:
+              _context3.next = 60;
               break;
-            case 68:
-              _context3.prev = 68;
-              _context3.t2 = _context3["catch"](50);
+            case 57:
+              _context3.prev = 57;
+              _context3.t2 = _context3["catch"](39);
               _iterator.e(_context3.t2);
-            case 71:
-              _context3.prev = 71;
+            case 60:
+              _context3.prev = 60;
               _iterator.f();
-              return _context3.finish(71);
-            case 74:
+              return _context3.finish(60);
+            case 63:
               if (amountOut) {
-                _context3.next = 76;
+                _context3.next = 65;
                 break;
               }
               throw new Error("Swapped event not found: ".concat(receipt.hash));
-            case 76:
+            case 65:
               return _context3.abrupt("return", {
                 fromToken: fromTokenAddress,
                 toToken: toTokenAddress,
@@ -348,11 +324,11 @@ var Hermes = /*#__PURE__*/function () {
                 to: receipt.from,
                 logs: receipt.logs
               });
-            case 77:
+            case 66:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[24, 30], [50, 68, 71, 74], [55, 62]]);
+        }, _callee3, this, [[13, 19], [39, 57, 60, 63], [44, 51]]);
       }));
       function swap(_x3) {
         return _swap.apply(this, arguments);
@@ -613,7 +589,6 @@ var Hermes = /*#__PURE__*/function () {
         var txReq,
           aggregatorAddress,
           wallet,
-          fromCoinAddress,
           swapParams,
           bridgeArgs,
           _txReq3,
@@ -645,14 +620,6 @@ var Hermes = /*#__PURE__*/function () {
               }
               throw new Error("Wallet not configured for chain: ".concat(params.chain));
             case 6:
-              fromCoinAddress = params.path[0].fromCoinAddress;
-              if (!(fromCoinAddress && fromCoinAddress !== ethers.ZeroAddress)) {
-                _context6.next = 10;
-                break;
-              }
-              _context6.next = 10;
-              return this.checkIsEnoughToken(fromCoinAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
-            case 10:
               // 准备合约参数
               swapParams = params.path.map(function (pathItem) {
                 var _pathItem$extra3;
@@ -680,78 +647,78 @@ var Hermes = /*#__PURE__*/function () {
               }
               _txReq3 = txReq, _ignore = _txReq3.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq3, _excluded3);
               aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet);
-              _context6.next = 17;
+              _context6.next = 13;
               return aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, estimationOverrides);
-            case 17:
+            case 13:
               estimateGas = _context6.sent;
               txReq = this.resolveGasLimit(txReq, estimateGas);
-              _context6.next = 21;
+              _context6.next = 17;
               return this.resolveNonce(wallet.provider, wallet.address, txReq);
-            case 21:
+            case 17:
               txReq = _context6.sent;
-              _context6.next = 24;
+              _context6.next = 20;
               return this.resolvePricing(wallet.provider, txReq);
-            case 24:
+            case 20:
               txReq = _context6.sent;
-              _context6.next = 27;
+              _context6.next = 23;
               return aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txReq);
-            case 27:
+            case 23:
               response = _context6.sent;
-              _context6.next = 30;
+              _context6.next = 26;
               return response.wait();
-            case 30:
+            case 26:
               txReceipt = _context6.sent;
               // 解析 SwapAndBridge 事件
               iface = new ethers.Interface(AggregatorAbi);
               outputAmountWei = null;
               _iterator2 = _createForOfIteratorHelper(txReceipt.logs);
-              _context6.prev = 34;
+              _context6.prev = 30;
               _iterator2.s();
-            case 36:
+            case 32:
               if ((_step2 = _iterator2.n()).done) {
-                _context6.next = 50;
+                _context6.next = 46;
                 break;
               }
               log = _step2.value;
               if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
-                _context6.next = 48;
+                _context6.next = 44;
                 break;
               }
-              _context6.prev = 39;
+              _context6.prev = 35;
               parsed = iface.parseLog(log);
               if (!(parsed && parsed.name === 'SwapAndBridge' && parsed.args && parsed.args.amountOut !== undefined)) {
-                _context6.next = 44;
+                _context6.next = 40;
                 break;
               }
               outputAmountWei = parsed.args.amountOut;
-              return _context6.abrupt("break", 50);
+              return _context6.abrupt("break", 46);
+            case 40:
+              _context6.next = 44;
+              break;
+            case 42:
+              _context6.prev = 42;
+              _context6.t0 = _context6["catch"](35);
             case 44:
-              _context6.next = 48;
+              _context6.next = 32;
               break;
             case 46:
-              _context6.prev = 46;
-              _context6.t0 = _context6["catch"](39);
-            case 48:
-              _context6.next = 36;
-              break;
-            case 50:
-              _context6.next = 55;
+              _context6.next = 51;
               break;
-            case 52:
-              _context6.prev = 52;
-              _context6.t1 = _context6["catch"](34);
+            case 48:
+              _context6.prev = 48;
+              _context6.t1 = _context6["catch"](30);
               _iterator2.e(_context6.t1);
-            case 55:
-              _context6.prev = 55;
+            case 51:
+              _context6.prev = 51;
               _iterator2.f();
-              return _context6.finish(55);
-            case 58:
+              return _context6.finish(51);
+            case 54:
               if (outputAmountWei) {
-                _context6.next = 60;
+                _context6.next = 56;
                 break;
               }
               throw new Error("SwapAndBridge event not found: ".concat(txReceipt.hash));
-            case 60:
+            case 56:
               return _context6.abrupt("return", {
                 fromToken: params.path[0].fromCoinAddress,
                 toToken: params.path[params.path.length - 1].toCoinAddress,
@@ -761,11 +728,11 @@ var Hermes = /*#__PURE__*/function () {
                 to: txReceipt.to,
                 logs: txReceipt.logs
               });
-            case 61:
+            case 57:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[34, 52, 55, 58], [39, 46]]);
+        }, _callee6, this, [[30, 48, 51, 54], [35, 42]]);
       }));
       function swapAndBridge(_x6) {
         return _swapAndBridge.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-swap",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A TypeScript utility library for swap and bridge",
   "type": "module",
   "main": "dist/esm/index.js",