hermes-swap 0.0.22 → 0.0.24

package/dist/esm/abis/quoter.js

@@ -62,7 +62,7 @@ var QuoterAbi = [{
     type: 'uint256[][]',
     internalType: 'uint256[][]'
   }],
-  stateMutability: 'view'
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'contractList',
@@ -128,7 +128,7 @@ var QuoterAbi = [{
     type: 'bool',
     internalType: 'bool'
   }],
-  stateMutability: 'view'
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'isWhitelist',
@@ -181,7 +181,7 @@ var QuoterAbi = [{
     type: 'uint256[]',
     internalType: 'uint256[]'
   }],
-  stateMutability: 'view'
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'owner',
@@ -230,47 +230,42 @@ var QuoterAbi = [{
     type: 'uint256',
     internalType: 'uint256'
   }],
-  stateMutability: 'view'
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'quoteBridge',
   inputs: [{
-    name: 'bridgeParams',
+    name: 'bridgeParam',
     type: 'tuple',
-    internalType: 'struct BridgeParams',
+    internalType: 'struct BridgeParam',
     components: [{
       name: 'bridge',
       type: 'string',
       internalType: 'string'
     }, {
-      name: 'bridgeParam',
-      type: 'tuple',
-      internalType: 'struct BridgeParam',
-      components: [{
-        name: 'token',
-        type: 'address',
-        internalType: 'address'
-      }, {
-        name: 'amount',
-        type: 'uint256',
-        internalType: 'uint256'
-      }, {
-        name: 'bridgeAddress',
-        type: 'address',
-        internalType: 'address'
-      }, {
-        name: 'refundAddress',
-        type: 'address',
-        internalType: 'address'
-      }, {
-        name: 'destinationChain',
-        type: 'string',
-        internalType: 'string'
-      }, {
-        name: 'adapterParams',
-        type: 'bytes',
-        internalType: 'bytes'
-      }]
+      name: 'token',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'amount',
+      type: 'uint256',
+      internalType: 'uint256'
+    }, {
+      name: 'bridgeAddress',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'destChain',
+      type: 'string',
+      internalType: 'string'
+    }, {
+      name: 'destUser',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'extra',
+      type: 'bytes',
+      internalType: 'bytes'
     }]
   }],
   outputs: [{
@@ -278,7 +273,7 @@ var QuoterAbi = [{
     type: 'uint256',
     internalType: 'uint256'
   }],
-  stateMutability: 'view'
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'removeContract',
@@ -377,5 +372,29 @@ var QuoterAbi = [{
     internalType: 'address'
   }],
   anonymous: false
+}, {
+  type: 'error',
+  name: 'NotExecutor',
+  inputs: [{
+    name: 'caller',
+    type: 'address',
+    internalType: 'address'
+  }, {
+    name: 'executor',
+    type: 'address',
+    internalType: 'address'
+  }]
+}, {
+  type: 'error',
+  name: 'NotOwner',
+  inputs: [{
+    name: 'caller',
+    type: 'address',
+    internalType: 'address'
+  }, {
+    name: 'owner',
+    type: 'address',
+    internalType: 'address'
+  }]
 }];
 export default QuoterAbi;

package/dist/esm/index.d.ts

@@ -12,7 +12,9 @@ declare class Hermes {
     expect(params: IExpectParams): Promise<bigint>;
     swap(params: ISwapParams): Promise<IReceipt>;
     bridge(params: IBridgeParams): Promise<IReceipt>;
+    estimateBridgeFee(params: IBridgeParams): Promise<bigint>;
     swapAndBridge(params: ISwapAndBridgeParams): Promise<IReceipt>;
+    private checkIsEnoughToken;
     private validateParams;
     private getQuoterAddress;
     private getAggregatorAddress;

package/dist/esm/index.js

@@ -90,11 +90,19 @@ var Hermes = /*#__PURE__*/function () {
                 };
               });
               _context.next = 10;
-              return quoter.multiQuote(params.amountInWei, quoteParams);
+              return quoter.multiQuote.staticCall(params.amountInWei, quoteParams, {
+                from: wallet.address
+              });
             case 10:
               amountOutList = _context.sent;
-              return _context.abrupt("return", amountOutList.length ? amountOutList[amountOutList.length - 1] : BigInt(0));
-            case 12:
+              if (amountOutList.length) {
+                _context.next = 13;
+                break;
+              }
+              throw new Error('No expect result return from smart contract');
+            case 13:
+              return _context.abrupt("return", amountOutList[amountOutList.length - 1]);
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -156,93 +164,90 @@ var Hermes = /*#__PURE__*/function () {
               return erc20.allowance(params.user, aggregatorAddress);
             case 19:
               currentAllowance = _context2.sent;
-              console.log(currentAllowance);
               if (!(currentAllowance < params.amountInWei)) {
-                _context2.next = 23;
+                _context2.next = 22;
                 break;
               }
               throw new Error('Insufficient allowance token amount for swap');
-            case 23:
-              _context2.prev = 23;
-              _context2.next = 26;
+            case 22:
+              _context2.prev = 22;
+              _context2.next = 25;
               return aggregator.getFunction('swap').estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
                 from: wallet.address
               });
-            case 26:
+            case 25:
               gas = _context2.sent;
-              console.log("Estimated gas for swap: ".concat(BigInt(gas).toString()));
-              _context2.next = 34;
+              _context2.next = 32;
               break;
-            case 30:
-              _context2.prev = 30;
-              _context2.t0 = _context2["catch"](23);
+            case 28:
+              _context2.prev = 28;
+              _context2.t0 = _context2["catch"](22);
               console.warn('Aggregator estimateGas.swap failed', _context2.t0);
               throw _context2.t0;
-            case 34:
-              _context2.prev = 34;
-              _context2.next = 37;
+            case 32:
+              _context2.prev = 32;
+              _context2.next = 35;
               return aggregator.getFunction('swap')(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
                 from: wallet.address
               });
-            case 37:
+            case 35:
               txResponse = _context2.sent;
-              _context2.next = 44;
+              _context2.next = 42;
               break;
-            case 40:
-              _context2.prev = 40;
-              _context2.t1 = _context2["catch"](34);
+            case 38:
+              _context2.prev = 38;
+              _context2.t1 = _context2["catch"](32);
               console.error('Aggregator swap transaction failed', _context2.t1);
               throw _context2.t1;
-            case 44:
-              _context2.next = 46;
+            case 42:
+              _context2.next = 44;
               return txResponse.wait();
-            case 46:
+            case 44:
               receipt = _context2.sent;
-              console.log("Swap transaction mined in block ".concat(receipt.blockNumber, " (tx: ").concat(receipt.hash, ")"));
               iface = new ethers.Interface(AggregatorAbi);
               amountOut = params.amountInWei;
               _iterator = _createForOfIteratorHelper(receipt.logs);
-              _context2.prev = 51;
+              _context2.prev = 48;
               _iterator.s();
-            case 53:
+            case 50:
               if ((_step = _iterator.n()).done) {
-                _context2.next = 67;
+                _context2.next = 64;
                 break;
               }
               log = _step.value;
               if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
-                _context2.next = 65;
+                _context2.next = 62;
                 break;
               }
-              _context2.prev = 56;
+              _context2.prev = 53;
               parsed = iface.parseLog(log);
               if (!(parsed && parsed.name === 'Swapped' && parsed.args && parsed.args.amountOut !== undefined)) {
-                _context2.next = 61;
+                _context2.next = 58;
                 break;
               }
               amountOut = parsed.args.amountOut;
-              return _context2.abrupt("break", 67);
-            case 61:
-              _context2.next = 65;
+              return _context2.abrupt("break", 64);
+            case 58:
+              _context2.next = 62;
               break;
-            case 63:
-              _context2.prev = 63;
-              _context2.t2 = _context2["catch"](56);
-            case 65:
-              _context2.next = 53;
+            case 60:
+              _context2.prev = 60;
+              _context2.t2 = _context2["catch"](53);
+            case 62:
+              _context2.next = 50;
               break;
-            case 67:
-              _context2.next = 72;
+            case 64:
+              _context2.next = 69;
               break;
+            case 66:
+              _context2.prev = 66;
+              _context2.t3 = _context2["catch"](48);
+              _iterator.e(_context2.t3);
             case 69:
               _context2.prev = 69;
-              _context2.t3 = _context2["catch"](51);
-              _iterator.e(_context2.t3);
-            case 72:
-              _context2.prev = 72;
               _iterator.f();
-              return _context2.finish(72);
-            case 75:
+              return _context2.finish(69);
+            case 72:
               return _context2.abrupt("return", {
                 fromToken: fromTokenAddress,
                 toToken: toTokenAddress,
@@ -252,11 +257,11 @@ var Hermes = /*#__PURE__*/function () {
                 to: receipt.from,
                 logs: receipt.logs
               });
-            case 76:
+            case 73:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[23, 30], [34, 40], [51, 69, 72, 75], [56, 63]]);
+        }, _callee2, this, [[22, 28], [32, 38], [48, 66, 69, 72], [53, 60]]);
       }));
       function swap(_x2) {
         return _swap.apply(this, arguments);
@@ -267,26 +272,104 @@ var Hermes = /*#__PURE__*/function () {
     key: "bridge",
     value: function () {
       var _bridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var receipt;
+        var _params$extra;
+        var aggregatorAddress, wallet, provider, nativeBalance, aggregator, bridgeArgs, txOverrides, txResponse, receipt;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.validateParams(params);
+
+              // set up
+              aggregatorAddress = this.getAggregatorAddress(params.chain);
+              wallet = this.walletMap.get(params.chain);
+              if (wallet) {
+                _context3.next = 5;
+                break;
+              }
+              throw new Error("Wallet not configured for chain: ".concat(params.chain));
+            case 5:
+              if (!(params.tokenAddress && params.tokenAddress !== ethers.ZeroAddress)) {
+                _context3.next = 8;
+                break;
+              }
+              _context3.next = 8;
+              return this.checkIsEnoughToken(params.tokenAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
+            case 8:
+              if (!(params.bridgeFee > 0n)) {
+                _context3.next = 17;
+                break;
+              }
+              provider = this.providerMap.get(params.chain);
+              if (provider) {
+                _context3.next = 12;
+                break;
+              }
+              throw new Error("Provider not configured for chain: ".concat(params.chain));
+            case 12:
+              _context3.next = 14;
+              return provider.getBalance(params.user);
+            case 14:
+              nativeBalance = _context3.sent;
+              if (!(nativeBalance < params.bridgeFee)) {
+                _context3.next = 17;
+                break;
+              }
+              throw new Error('Insufficient native balance for bridge fee');
+            case 17:
+              aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet); // simulate
+              bridgeArgs = {
+                bridge: params.bridgeType,
+                token: params.tokenAddress,
+                amount: params.amountInWei,
+                bridgeAddress: params.bridgeAddress,
+                destChain: params.destChain,
+                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;
+            case 25:
+              _context3.prev = 25;
+              _context3.t0 = _context3["catch"](20);
+              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;
+            case 35:
+              _context3.prev = 35;
+              _context3.t1 = _context3["catch"](29);
+              console.error('Aggregator swap transaction failed', _context3.t1);
+              throw _context3.t1;
+            case 39:
               receipt = {
                 fromToken: params.tokenAddress,
                 toToken: params.tokenAddress,
                 amountOut: params.amountInWei,
-                hash: '',
-                from: '',
-                to: '',
-                logs: []
+                hash: txResponse.hash,
+                from: txResponse.from,
+                to: txResponse.to,
+                logs: txResponse.logs
               };
               return _context3.abrupt("return", Promise.resolve(receipt));
-            case 3:
+            case 41:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this);
+        }, _callee3, this, [[20, 25], [29, 35]]);
       }));
       function bridge(_x3) {
         return _bridge.apply(this, arguments);
@@ -294,35 +377,196 @@ var Hermes = /*#__PURE__*/function () {
       return bridge;
     }()
   }, {
-    key: "swapAndBridge",
+    key: "estimateBridgeFee",
     value: function () {
-      var _swapAndBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var receipt;
+      var _estimateBridgeFee = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var _params$extra2;
+        var wallet, address, quoter, bridgeArgs, bridgeFee;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.validateParams(params);
+              wallet = this.walletMap.get(params.chain);
+              if (wallet) {
+                _context4.next = 4;
+                break;
+              }
+              throw new Error("Wallet not configured for chain: ".concat(params.chain));
+            case 4:
+              address = this.getQuoterAddress(params.chain);
+              if (address) {
+                _context4.next = 7;
+                break;
+              }
+              throw new Error("Quoter address not found for chain: ".concat(params.chain));
+            case 7:
+              quoter = new Contract(address, QuoterAbi, wallet);
+              bridgeArgs = {
+                bridge: params.bridgeType,
+                token: params.tokenAddress,
+                amount: params.amountInWei,
+                bridgeAddress: params.bridgeAddress,
+                destChain: params.destChain,
+                destUser: params.destUser,
+                extra: (_params$extra2 = params.extra) !== null && _params$extra2 !== void 0 ? _params$extra2 : '0x'
+              };
+              _context4.next = 11;
+              return quoter.quoteBridge.staticCall(bridgeArgs, {
+                from: wallet.address
+              });
+            case 11:
+              bridgeFee = _context4.sent;
+              return _context4.abrupt("return", bridgeFee);
+            case 13:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function estimateBridgeFee(_x4) {
+        return _estimateBridgeFee.apply(this, arguments);
+      }
+      return estimateBridgeFee;
+    }()
+  }, {
+    key: "swapAndBridge",
+    value: function () {
+      var _swapAndBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+        var _params$extra3;
+        var aggregatorAddress, wallet, fromCoinAddress, swapParams, bridgeArgs, txOverrides, aggregator, txResponse, receipt;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              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;
+                break;
+              }
+              throw new Error("Wallet not configured for chain: ".concat(params.chain));
+            case 5:
+              fromCoinAddress = params.path[0].fromCoinAddress;
+              if (!(fromCoinAddress && fromCoinAddress !== ethers.ZeroAddress)) {
+                _context5.next = 9;
+                break;
+              }
+              _context5.next = 9;
+              return this.checkIsEnoughToken(fromCoinAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
+            case 9:
+              // 准备合约参数
+              swapParams = params.path.map(function (pathItem) {
+                var _pathItem$extra2;
+                return {
+                  dexType: pathItem.dexType,
+                  pool: pathItem.poolAddress,
+                  fromCoin: pathItem.fromCoinAddress,
+                  toCoin: pathItem.toCoinAddress,
+                  extra: (_pathItem$extra2 = pathItem.extra) !== null && _pathItem$extra2 !== void 0 ? _pathItem$extra2 : '0x'
+                };
+              });
+              bridgeArgs = {
+                bridge: params.bridgeType,
+                token: params.tokenAddress,
+                amount: params.amountInWei,
+                bridgeAddress: params.bridgeAddress,
+                destChain: params.destChain,
+                destUser: params.destUser,
+                extra: (_params$extra3 = params.extra) !== null && _params$extra3 !== void 0 ? _params$extra3 : '0x'
+              };
+              txOverrides = {
+                from: wallet.address,
+                value: params.bridgeFee
+              }; // simulate
+              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;
+              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;
+              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 = {
                 fromToken: params.path[0].fromCoinAddress,
                 toToken: params.path[params.path.length - 1].toCoinAddress,
                 amountOut: params.minAmountOutList[params.minAmountOutList.length - 1],
-                hash: '',
-                from: '',
-                to: '',
-                logs: []
+                hash: txResponse.hash,
+                from: txResponse.from,
+                to: txResponse.to,
+                logs: txResponse.logs
               };
-              return _context4.abrupt("return", Promise.resolve(receipt));
-            case 3:
+              return _context5.abrupt("return", Promise.resolve(receipt));
+            case 34:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this, [[13, 18], [22, 28]]);
       }));
-      function swapAndBridge(_x4) {
+      function swapAndBridge(_x5) {
         return _swapAndBridge.apply(this, arguments);
       }
       return swapAndBridge;
     }()
+  }, {
+    key: "checkIsEnoughToken",
+    value: function () {
+      var _checkIsEnoughToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(fromTokenAddress, userAddress, amountInWei, aggregatorAddress, wallet) {
+        var erc20, userBalance, currentAllowance;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], wallet);
+              _context6.next = 3;
+              return erc20.balanceOf(userAddress);
+            case 3:
+              userBalance = _context6.sent;
+              if (!(userBalance < amountInWei)) {
+                _context6.next = 6;
+                break;
+              }
+              throw new Error('Insufficient balance token amount');
+            case 6:
+              _context6.next = 8;
+              return erc20.allowance(userAddress, aggregatorAddress);
+            case 8:
+              currentAllowance = _context6.sent;
+              console.log(currentAllowance);
+              if (!(currentAllowance < amountInWei)) {
+                _context6.next = 12;
+                break;
+              }
+              throw new Error('Insufficient allowance token amount');
+            case 12:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6);
+      }));
+      function checkIsEnoughToken(_x6, _x7, _x8, _x9, _x10) {
+        return _checkIsEnoughToken.apply(this, arguments);
+      }
+      return checkIsEnoughToken;
+    }()
   }, {
     key: "validateParams",
     value: function validateParams(params) {