hermes-swap 0.0.12 → 0.0.13

package/dist/esm/index.js

@@ -14,7 +14,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 } from "./types";
 import { ethers } from 'ethers';
 import { Contract } from 'ethers';
 import QuoterAbi from "./abis/quoter";
@@ -65,117 +64,41 @@ var Hermes = /*#__PURE__*/function () {
     key: "expect",
     value: function () {
       var _expect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-        var tokenPair, address, provider, quoteParams, executorWallet, quoter, amountOutList;
+        var executorWallet, address, quoter, quoteParams, amountOutList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              // 直接调用fx合约： fx合约地址： 0xF9C0c2afCF3CB0B29c32dc2B3Bc8feA039206bdf
-              // this.validateParams(params);
-
-              // const tokenPair = this.getTokenPair(params.chain, params.fromToken, params.toToken);
-              // const provider = this.providerMap.get(params.chain);
-              // if (!provider) {
-              //     throw new Error(`Provider not found for chain: ${params.chain}`);
-              // }
-
-              // if (!tokenPair.path.length) {
-              //     throw new Error(`Quote path not configured for chain: ${params.chain} from: ${params.fromToken} to: ${params.toToken}`);
-              // }
-
-              // const fxPath = tokenPair.path[0];
-              // const fxAbi: ethers.InterfaceAbi = [
-              //     {
-              //         inputs: [
-              //             {
-              //                 components: [
-              //                     { internalType: 'uint256', name: 'amountIn', type: 'uint256' },
-              //                     { internalType: 'address', name: 'pool', type: 'address' },
-              //                     { internalType: 'address', name: 'fromCoin', type: 'address' },
-              //                     { internalType: 'address', name: 'toCoin', type: 'address' },
-              //                     { internalType: 'bytes', name: 'extra', type: 'bytes' },
-              //                 ],
-              //                 internalType: 'struct QuoteParam',
-              //                 name: 'param',
-              //                 type: 'tuple',
-              //             },
-              //         ],
-              //         name: 'quote',
-              //         outputs: [
-              //             { internalType: 'uint256', name: 'amountOut', type: 'uint256' },
-              //         ],
-              //         stateMutability: 'view',
-              //         type: 'function',
-              //     },
-              // ];
-
-              // const fxContract = new Contract('0xF9C0c2afCF3CB0B29c32dc2B3Bc8feA039206bdf', fxAbi, provider);
-              // const amountOut = await fxContract.quote({
-              //     amountIn: params.amount,
-              //     pool: fxPath.pool,
-              //     fromCoin: fxPath.fromCoin,
-              //     toCoin: fxPath.toCoin,
-              //     extra: params.extra ?? fxPath.extra ?? '0x',
-              // });
-              // return amountOut as bigint;
-
-              // 校验
-              this.validateParams(params);
-
-              // 找池子:  weth => usdt
-              tokenPair = this.getTokenPair(params.chain, params.fromToken, params.toToken);
-              if (tokenPair) {
-                _context.next = 4;
+              // 调用合约
+              executorWallet = this.executorMap.get(params.chain);
+              if (executorWallet) {
+                _context.next = 3;
                 break;
               }
-              throw new Error("Token pair not found for chain: ".concat(params.chain));
-            case 4:
+              throw new Error("Executor wallet not configured for chain: ".concat(params.chain));
+            case 3:
               address = this.getQuoterAddress(params.chain);
-              console.log("quoter address: ", address);
-              provider = this.providerMap.get(params.chain);
-              if (provider) {
-                _context.next = 9;
+              if (address) {
+                _context.next = 6;
                 break;
               }
-              throw new Error("Provider not found for chain: ".concat(params.chain));
-            case 9:
-              if (tokenPair.path.length) {
-                _context.next = 11;
-                break;
-              }
-              throw new Error("Quote path not configured for chain: ".concat(params.chain, " from: ").concat(params.fromToken, " to: ").concat(params.toToken));
-            case 11:
-              console.log("dex type: ", params.dexType);
-              quoteParams = tokenPair.path.map(function (pathItem) {
-                var _params$dexType, _ref, _pathItem$extra;
+              throw new Error("Quoter address not found for chain: ".concat(params.chain));
+            case 6:
+              quoter = new Contract(address, QuoterAbi, executorWallet); // 转换字段名以匹配合约 ABI
+              quoteParams = params.path.map(function (p) {
                 return {
-                  dexType: (_params$dexType = params.dexType) !== null && _params$dexType !== void 0 ? _params$dexType : pathItem.dexType,
-                  pool: pathItem.pool,
-                  fromCoin: pathItem.fromCoin,
-                  toCoin: pathItem.toCoin,
-                  extra: (_ref = (_pathItem$extra = pathItem.extra) !== null && _pathItem$extra !== void 0 ? _pathItem$extra : params.extra) !== null && _ref !== void 0 ? _ref : '0x'
+                  dexType: p.dexType,
+                  pool: p.poolAddress,
+                  fromCoin: p.fromCoinAddress,
+                  toCoin: p.toCoinAddress,
+                  extra: p.extra || '0x'
                 };
-              }); // 调用合约
-              executorWallet = this.executorMap.get(params.chain);
-              if (executorWallet) {
-                _context.next = 16;
-                break;
-              }
-              throw new Error("Executor wallet not configured for chain: ".concat(params.chain));
-            case 16:
-              console.log("wallet address: ", executorWallet.address);
-              quoter = new Contract(address, QuoterAbi, executorWallet);
-              _context.t0 = console;
-              _context.next = 21;
-              return quoter.executor();
-            case 21:
-              _context.t1 = _context.sent;
-              _context.t0.log.call(_context.t0, "executor address: ", _context.t1);
-              _context.next = 25;
-              return quoter.multiQuote(params.amount, quoteParams);
-            case 25:
+              });
+              _context.next = 10;
+              return quoter.multiQuote(params.amountInWei, quoteParams);
+            case 10:
               amountOutList = _context.sent;
               return _context.abrupt("return", amountOutList.length ? amountOutList[amountOutList.length - 1] : BigInt(0));
-            case 27:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -188,33 +111,70 @@ var Hermes = /*#__PURE__*/function () {
     }()
   }, {
     key: "swap",
-    value: function swap(params) {
-      this.validateParams(params);
-      var receipt = {
-        fromToken: params.fromToken,
-        toToken: params.toToken,
-        amount: params.amount
-      };
-      return Promise.resolve(receipt);
-    }
+    value: function () {
+      var _swap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var receipt;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              this.validateParams(params);
+              receipt = {};
+              return _context2.abrupt("return", Promise.resolve(receipt));
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function swap(_x2) {
+        return _swap.apply(this, arguments);
+      }
+      return swap;
+    }()
   }, {
     key: "bridge",
-    value: function bridge(params) {
-      this.validateParams(params);
-      var receipt = {
-        fromToken: params.fromToken,
-        toToken: params.toToken,
-        amount: params.amount
-      };
-      return Promise.resolve(receipt);
-    }
+    value: function () {
+      var _bridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+        var receipt;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this.validateParams(params);
+              receipt = {};
+              return _context3.abrupt("return", Promise.resolve(receipt));
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function bridge(_x3) {
+        return _bridge.apply(this, arguments);
+      }
+      return bridge;
+    }()
   }, {
     key: "swapAndBridge",
-    value: function swapAndBridge(params) {
-      this.validateParams(params);
-      var receipt = {};
-      return Promise.resolve(receipt);
-    }
+    value: function () {
+      var _swapAndBridge = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var receipt;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              this.validateParams(params);
+              receipt = {};
+              return _context4.abrupt("return", Promise.resolve(receipt));
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function swapAndBridge(_x4) {
+        return _swapAndBridge.apply(this, arguments);
+      }
+      return swapAndBridge;
+    }()
   }, {
     key: "validateParams",
     value: function validateParams(params) {
@@ -226,43 +186,6 @@ var Hermes = /*#__PURE__*/function () {
         throw new Error('Provider not found');
       }
     }
-  }, {
-    key: "getAllTokenPair",
-    value: function getAllTokenPair() {
-      return _defineProperty({}, ChainNameEnum.ETH, [{
-        from: AddressConst.weth.eth,
-        to: AddressConst.usdt.eth,
-        path: []
-      },
-      // fx
-      {
-        from: AddressConst.weth.eth,
-        to: AddressConst.feth.eth,
-        path: [{
-          dexType: 'f(x)',
-          pool: '0xe7b9c7c9cA85340b8c06fb805f7775e3015108dB',
-          fromCoin: AddressConst.weth.eth,
-          toCoin: AddressConst.feth.eth,
-          extra: '0x'
-        }]
-      }]);
-    }
-  }, {
-    key: "getTokenPair",
-    value: function getTokenPair(chain, from, to) {
-      var tokenPairMap = this.getAllTokenPair();
-      var tokenPairList = tokenPairMap[chain];
-      if (!tokenPairList) {
-        throw new Error("Token pair not found for chain: ".concat(chain));
-      }
-      var tokenPair = tokenPairList.find(function (item) {
-        return item.from.toLocaleLowerCase() === from.toLocaleLowerCase() && item.to.toLocaleLowerCase() === to.toLocaleLowerCase();
-      });
-      if (!tokenPair) {
-        throw new Error("Token pair not found for chain: ".concat(chain, " from: ").concat(from, " to: ").concat(to));
-      }
-      return tokenPair;
-    }
   }, {
     key: "getQuoterAddress",
     value: function getQuoterAddress(chain) {

package/dist/esm/types.d.ts

@@ -7,31 +7,37 @@ export interface IConfig {
 }
 export interface IExpectParams {
     chain: ChainNameEnum;
-    dexType?: string;
-    fromToken: string;
-    toToken: string;
-    amount: bigint;
-    extra?: BytesLike;
+    amountInWei: bigint;
+    path: IPath[];
 }
 export interface ISwapParams {
-    chain: ChainNameEnum;
     user: string;
-    fromToken: string;
-    toToken: string;
-    amount: bigint;
+    chain: ChainNameEnum;
+    amountInWei: bigint;
+    path: IPath[];
+    minAmountOutList: bigint[];
 }
 export interface IBridgeParams {
     chain: ChainNameEnum;
     user: string;
-    fromToken: string;
-    toToken: string;
-    amount: bigint;
+    amountInWei: bigint;
+    bridgeType: string;
+    bridgeAddress: string;
+    tokenAddress: string;
+    destChain: string;
+    extra?: BytesLike;
 }
 export interface ISwapAndBridgeParams {
     chain: ChainNameEnum;
     user: string;
-    swapParams: ISwapParams;
-    bridgeParams: IBridgeParams;
+    amountInWei: bigint;
+    path: IPath[];
+    minAmountOutList: bigint[];
+    bridgeType: string;
+    bridgeAddress: string;
+    tokenAddress: string;
+    destChain: string;
+    extra?: BytesLike;
 }
 export interface IReceipt {
     fromToken?: string;
@@ -216,3 +222,10 @@ export declare const AddressConst: {
 };
 export interface IExpectPayload {
 }
+export interface IPath {
+    dexType: string;
+    poolAddress: string;
+    fromCoinAddress: string;
+    toCoinAddress: string;
+    extra?: BytesLike;
+}

package/dist/esm/types.js

@@ -160,16 +160,16 @@ export var ChainNameEnum = /*#__PURE__*/function (ChainNameEnum) {
 }({}); // BEVM
 export var AddressConst = {
   weth: {
-    eth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+    eth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
   },
   usdt: {
-    eth: ""
+    eth: ''
   },
   // fx
   feth: {
-    eth: "0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726"
+    eth: '0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726'
   },
   xeth: {
-    eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2"
+    eth: '0xe063F04f280c60aECa68b38341C2eEcBeC703ae2'
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-swap",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "A TypeScript utility library for swap and bridge",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",
@@ -42,4 +42,4 @@
     "dotenv": "^17.2.3",
     "ethers": "^6.15.0"
   }
-}
+}