hermes-swap 0.0.12 → 0.0.13

package/dist/cjs/index.d.ts

@@ -12,8 +12,6 @@ declare class Hermes {
     bridge(params: IBridgeParams): Promise<IReceipt>;
     swapAndBridge(params: ISwapAndBridgeParams): Promise<IReceipt>;
     private validateParams;
-    private getAllTokenPair;
-    private getTokenPair;
     private getQuoterAddress;
     private getAggregatorAddress;
 }

package/dist/cjs/index.js

@@ -32,7 +32,6 @@ __export(src_exports, {
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
-var import_types = require("./types");
 var import_ethers = require("ethers");
 var import_ethers2 = require("ethers");
 var import_quoter = __toESM(require("./abis/quoter"));
@@ -64,57 +63,36 @@ var Hermes = class {
     }
   }
   async expect(params) {
-    this.validateParams(params);
-    const tokenPair = this.getTokenPair(params.chain, params.fromToken, params.toToken);
-    if (!tokenPair) {
-      throw new Error(`Token pair not found for chain: ${params.chain}`);
-    }
-    const address = this.getQuoterAddress(params.chain);
-    console.log("quoter address: ", address);
-    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}`);
-    }
-    console.log("dex type: ", params.dexType);
-    const quoteParams = tokenPair.path.map((pathItem) => ({
-      dexType: params.dexType ?? pathItem.dexType,
-      pool: pathItem.pool,
-      fromCoin: pathItem.fromCoin,
-      toCoin: pathItem.toCoin,
-      extra: pathItem.extra ?? params.extra ?? "0x"
-    }));
     const executorWallet = this.executorMap.get(params.chain);
     if (!executorWallet) {
       throw new Error(`Executor wallet not configured for chain: ${params.chain}`);
     }
-    console.log("wallet address: ", executorWallet.address);
+    const address = this.getQuoterAddress(params.chain);
+    if (!address) {
+      throw new Error(`Quoter address not found for chain: ${params.chain}`);
+    }
     const quoter = new import_ethers2.Contract(address, import_quoter.default, executorWallet);
-    console.log("executor address: ", await quoter.executor());
-    const amountOutList = await quoter.multiQuote(params.amount, quoteParams);
+    const quoteParams = params.path.map((p) => ({
+      dexType: p.dexType,
+      pool: p.poolAddress,
+      fromCoin: p.fromCoinAddress,
+      toCoin: p.toCoinAddress,
+      extra: p.extra || "0x"
+    }));
+    const amountOutList = await quoter.multiQuote(params.amountInWei, quoteParams);
     return amountOutList.length ? amountOutList[amountOutList.length - 1] : BigInt(0);
   }
-  swap(params) {
+  async swap(params) {
     this.validateParams(params);
-    const receipt = {
-      fromToken: params.fromToken,
-      toToken: params.toToken,
-      amount: params.amount
-    };
+    const receipt = {};
     return Promise.resolve(receipt);
   }
-  bridge(params) {
+  async bridge(params) {
     this.validateParams(params);
-    const receipt = {
-      fromToken: params.fromToken,
-      toToken: params.toToken,
-      amount: params.amount
-    };
+    const receipt = {};
     return Promise.resolve(receipt);
   }
-  swapAndBridge(params) {
+  async swapAndBridge(params) {
     this.validateParams(params);
     const receipt = {};
     return Promise.resolve(receipt);
@@ -128,39 +106,6 @@ var Hermes = class {
       throw new Error("Provider not found");
     }
   }
-  getAllTokenPair() {
-    return {
-      [import_types.ChainNameEnum.ETH]: [
-        { from: import_types.AddressConst.weth.eth, to: import_types.AddressConst.usdt.eth, path: [] },
-        // fx
-        {
-          from: import_types.AddressConst.weth.eth,
-          to: import_types.AddressConst.feth.eth,
-          path: [
-            {
-              dexType: "f(x)",
-              pool: "0xe7b9c7c9cA85340b8c06fb805f7775e3015108dB",
-              fromCoin: import_types.AddressConst.weth.eth,
-              toCoin: import_types.AddressConst.feth.eth,
-              extra: "0x"
-            }
-          ]
-        }
-      ]
-    };
-  }
-  getTokenPair(chain, from, to) {
-    const tokenPairMap = this.getAllTokenPair();
-    const tokenPairList = tokenPairMap[chain];
-    if (!tokenPairList) {
-      throw new Error(`Token pair not found for chain: ${chain}`);
-    }
-    const tokenPair = tokenPairList.find((item) => item.from.toLocaleLowerCase() === from.toLocaleLowerCase() && item.to.toLocaleLowerCase() === to.toLocaleLowerCase());
-    if (!tokenPair) {
-      throw new Error(`Token pair not found for chain: ${chain} from: ${from} to: ${to}`);
-    }
-    return tokenPair;
-  }
   getQuoterAddress(chain) {
     if (this.quoterAddressMap.has(chain)) {
       return this.quoterAddressMap.get(chain);

package/dist/cjs/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;
+}