hermes-swap 0.0.23 → 0.0.24

package/dist/cjs/index.js

@@ -79,8 +79,11 @@ var Hermes = class {
       toCoin: p.toCoinAddress,
       extra: p.extra || "0x"
     }));
-    const amountOutList = await quoter.multiQuote(params.amountInWei, quoteParams);
-    return amountOutList.length ? amountOutList[amountOutList.length - 1] : BigInt(0);
+    const amountOutList = await quoter.multiQuote.staticCall(params.amountInWei, quoteParams, { from: wallet.address });
+    if (!amountOutList.length) {
+      throw new Error("No expect result return from smart contract");
+    }
+    return amountOutList[amountOutList.length - 1];
   }
   async swap(params) {
     this.validateParams(params);
@@ -108,13 +111,11 @@ var Hermes = class {
       throw new Error("Insufficient balance for swap");
     }
     const currentAllowance = await erc20.allowance(params.user, aggregatorAddress);
-    console.log(currentAllowance);
     if (currentAllowance < params.amountInWei) {
       throw new Error("Insufficient allowance token amount for swap");
     }
     try {
       const gas = await aggregator.getFunction("swap").estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, { from: wallet.address });
-      console.log(`Estimated gas for swap: ${BigInt(gas).toString()}`);
     } catch (error) {
       console.warn("Aggregator estimateGas.swap failed", error);
       throw error;
@@ -127,7 +128,6 @@ var Hermes = class {
       throw error;
     }
     const receipt = await txResponse.wait();
-    console.log(`Swap transaction mined in block ${receipt.blockNumber} (tx: ${receipt.hash})`);
     const iface = new import_ethers.ethers.Interface(import_aggregator.default);
     let amountOut = params.amountInWei;
     for (const log of receipt.logs) {
@@ -235,14 +235,57 @@ var Hermes = class {
   }
   async swapAndBridge(params) {
     this.validateParams(params);
+    const aggregatorAddress = this.getAggregatorAddress(params.chain);
+    const wallet = this.walletMap.get(params.chain);
+    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,
+      fromCoin: pathItem.fromCoinAddress,
+      toCoin: pathItem.toCoinAddress,
+      extra: pathItem.extra ?? "0x"
+    }));
+    const bridgeArgs = {
+      bridge: params.bridgeType,
+      token: params.tokenAddress,
+      amount: params.amountInWei,
+      bridgeAddress: params.bridgeAddress,
+      destChain: params.destChain,
+      destUser: params.destUser,
+      extra: params.extra ?? "0x"
+    };
+    const txOverrides = {
+      from: wallet.address,
+      value: params.bridgeFee
+    };
+    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    try {
+      await aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
+    } catch (error) {
+      console.error("Bridge gas estimation reverted", error);
+      throw error;
+    }
+    let txResponse;
+    try {
+      txResponse = await aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
+    } catch (error) {
+      console.error("Aggregator swap and bridge transaction failed", error);
+      throw error;
+    }
     const 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 Promise.resolve(receipt);
   }

package/dist/cjs/types.d.ts

@@ -90,6 +90,10 @@ export declare enum DexType {
     CURVE128 = "curve128",
     CURVE256 = "curve256"
 }
+export declare enum BridgeType {
+    LAYERZEROV1 = "layerzero_v1",
+    LAYERZEROV2 = "layerzero_v2"
+}
 export declare enum ChainNameEnum {
     ETH = "ETH",// Ethereum Mainnet
     ARB = "ARB",// Arbitrum One
@@ -252,15 +256,18 @@ export interface IRpcConfig {
 export declare const AddressConst: {
     weth: {
         eth: string;
+        arb: string;
     };
     usdt: {
         eth: string;
     };
     feth: {
         eth: string;
+        arb: string;
     };
     xeth: {
         eth: string;
+        arb: string;
     };
     arb: {
         arb: string;

package/dist/cjs/types.js

@@ -20,6 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var types_exports = {};
 __export(types_exports, {
   AddressConst: () => AddressConst,
+  BridgeType: () => BridgeType,
   ChainNameEnum: () => ChainNameEnum,
   DexType: () => DexType
 });
@@ -31,6 +32,11 @@ var DexType = /* @__PURE__ */ ((DexType2) => {
   DexType2["CURVE256"] = "curve256";
   return DexType2;
 })(DexType || {});
+var BridgeType = /* @__PURE__ */ ((BridgeType2) => {
+  BridgeType2["LAYERZEROV1"] = "layerzero_v1";
+  BridgeType2["LAYERZEROV2"] = "layerzero_v2";
+  return BridgeType2;
+})(BridgeType || {});
 var ChainNameEnum = /* @__PURE__ */ ((ChainNameEnum2) => {
   ChainNameEnum2["ETH"] = "ETH";
   ChainNameEnum2["ARB"] = "ARB";
@@ -189,17 +195,20 @@ var ChainNameEnum = /* @__PURE__ */ ((ChainNameEnum2) => {
 })(ChainNameEnum || {});
 var AddressConst = {
   weth: {
-    eth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+    eth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    arb: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
   },
   usdt: {
     eth: ""
   },
   // fx
   feth: {
-    eth: "0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726"
+    eth: "0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726",
+    arb: "0xc608Dfb90A430Df79a8a1eDBC8be7f1A0Eb4E763"
   },
   xeth: {
-    eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2"
+    eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2",
+    arb: "0x55380fe7A1910dFf29A47B622057ab4139DA42C5"
   },
   arb: {
     arb: "0x912CE59144191C1204E64559FE8253a0e49E6548"
@@ -211,6 +220,7 @@ var AddressConst = {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddressConst,
+  BridgeType,
   ChainNameEnum,
   DexType
 });

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);
@@ -427,26 +432,95 @@ var Hermes = /*#__PURE__*/function () {
     key: "swapAndBridge",
     value: function () {
       var _swapAndBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var receipt;
+        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 _context5.abrupt("return", Promise.resolve(receipt));
-            case 3:
+            case 34:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this);
+        }, _callee5, this, [[13, 18], [22, 28]]);
       }));
       function swapAndBridge(_x5) {
         return _swapAndBridge.apply(this, arguments);

package/dist/esm/types.d.ts

@@ -90,6 +90,10 @@ export declare enum DexType {
     CURVE128 = "curve128",
     CURVE256 = "curve256"
 }
+export declare enum BridgeType {
+    LAYERZEROV1 = "layerzero_v1",
+    LAYERZEROV2 = "layerzero_v2"
+}
 export declare enum ChainNameEnum {
     ETH = "ETH",// Ethereum Mainnet
     ARB = "ARB",// Arbitrum One
@@ -252,15 +256,18 @@ export interface IRpcConfig {
 export declare const AddressConst: {
     weth: {
         eth: string;
+        arb: string;
     };
     usdt: {
         eth: string;
     };
     feth: {
         eth: string;
+        arb: string;
     };
     xeth: {
         eth: string;
+        arb: string;
     };
     arb: {
         arb: string;

package/dist/esm/types.js

@@ -5,6 +5,11 @@ export var DexType = /*#__PURE__*/function (DexType) {
   DexType["CURVE256"] = "curve256";
   return DexType;
 }({});
+export var BridgeType = /*#__PURE__*/function (BridgeType) {
+  BridgeType["LAYERZEROV1"] = "layerzero_v1";
+  BridgeType["LAYERZEROV2"] = "layerzero_v2";
+  return BridgeType;
+}({});
 export var ChainNameEnum = /*#__PURE__*/function (ChainNameEnum) {
   ChainNameEnum["ETH"] = "ETH";
   ChainNameEnum["ARB"] = "ARB";
@@ -163,17 +168,20 @@ export var ChainNameEnum = /*#__PURE__*/function (ChainNameEnum) {
 }({}); // BEVM
 export var AddressConst = {
   weth: {
-    eth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
+    eth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    arb: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1'
   },
   usdt: {
     eth: ''
   },
   // fx
   feth: {
-    eth: '0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726'
+    eth: '0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726',
+    arb: '0xc608Dfb90A430Df79a8a1eDBC8be7f1A0Eb4E763'
   },
   xeth: {
-    eth: '0xe063F04f280c60aECa68b38341C2eEcBeC703ae2'
+    eth: '0xe063F04f280c60aECa68b38341C2eEcBeC703ae2',
+    arb: '0x55380fe7A1910dFf29A47B622057ab4139DA42C5'
   },
   arb: {
     arb: '0x912CE59144191C1204E64559FE8253a0e49E6548'

package/package.json

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