hermes-swap 0.0.20 → 0.0.22

package/dist/cjs/index.d.ts

@@ -1,5 +1,7 @@
-import { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath } from './types.js';
-export { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath };
+import type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath } from './types.js';
+import { ChainNameEnum, AddressConst, DexType } from './types.js';
+export type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath };
+export { ChainNameEnum, AddressConst, DexType };
 declare class Hermes {
     private config;
     private providerMap;

package/dist/cjs/index.js

@@ -33,14 +33,6 @@ __export(src_exports, {
   ChainNameEnum: () => import_types.ChainNameEnum,
   DexType: () => import_types.DexType,
   Hermes: () => Hermes,
-  IBridgeParams: () => import_types.IBridgeParams,
-  IConfig: () => import_types.IConfig,
-  IExpectParams: () => import_types.IExpectParams,
-  IExpectPayload: () => import_types.IExpectPayload,
-  IReceipt: () => import_types.IReceipt,
-  IRouterPath: () => import_types.IRouterPath,
-  ISwapAndBridgeParams: () => import_types.ISwapAndBridgeParams,
-  ISwapParams: () => import_types.ISwapParams,
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
@@ -63,7 +55,6 @@ var Hermes = class {
         this.walletMap.set(chainName, new import_ethers.ethers.Wallet(rpc.privateKey, provider));
       }
     }
-    console.log(Object.entries(this.config.rpc), this.walletMap);
     for (const [chainName, quoterAddress] of Object.entries(this.config.quoterAddress)) {
       this.quoterAddressMap.set(chainName, quoterAddress);
     }
@@ -154,17 +145,37 @@ var Hermes = class {
     return {
       fromToken: fromTokenAddress,
       toToken: toTokenAddress,
-      amountOut
+      amountOut,
+      hash: receipt.hash,
+      from: receipt.from,
+      to: receipt.from,
+      logs: receipt.logs
     };
   }
   async bridge(params) {
     this.validateParams(params);
-    const receipt = {};
+    const receipt = {
+      fromToken: params.tokenAddress,
+      toToken: params.tokenAddress,
+      amountOut: params.amountInWei,
+      hash: "",
+      from: "",
+      to: "",
+      logs: []
+    };
     return Promise.resolve(receipt);
   }
   async swapAndBridge(params) {
     this.validateParams(params);
-    const receipt = {};
+    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: []
+    };
     return Promise.resolve(receipt);
   }
   validateParams(params) {
@@ -195,13 +206,5 @@ var src_default = Hermes;
   AddressConst,
   ChainNameEnum,
   DexType,
-  Hermes,
-  IBridgeParams,
-  IConfig,
-  IExpectParams,
-  IExpectPayload,
-  IReceipt,
-  IRouterPath,
-  ISwapAndBridgeParams,
-  ISwapParams
+  Hermes
 });

package/dist/cjs/types.d.ts

@@ -1,4 +1,4 @@
-import type { BytesLike } from 'ethers';
+import type { BytesLike, JsonRpcProvider } from 'ethers';
 export interface IConfig {
     rpc: Record<string, IRpcConfig>;
     quoterAddress: Record<string, string>;
@@ -39,9 +39,46 @@ export interface ISwapAndBridgeParams {
     extra?: BytesLike;
 }
 export interface IReceipt {
-    fromToken?: string;
-    toToken?: string;
-    amountOut?: bigint;
+    fromToken: string;
+    toToken: string;
+    amountOut: bigint;
+    hash: string;
+    from: string;
+    to: string;
+    logs: ILog[];
+}
+export interface IEthersReceipt {
+    provider: JsonRpcProvider;
+    to: string;
+    from: string;
+    contractAddress: string | null;
+    hash: string;
+    index: number;
+    blockHash: string;
+    blockNumber: number;
+    logsBloom: string;
+    gasUsed: bigint;
+    blobGasUsed: null;
+    cumulativeGasUsed: bigint;
+    gasPrice: bigint;
+    blobGasPrice: null;
+    type: number;
+    status: number;
+    root: undefined;
+    logs: ILog[];
+}
+export interface ILog {
+    provider: JsonRpcProvider;
+    transactionHash: string;
+    blockHash: string;
+    blockNumber: number;
+    removed: undefined;
+    address: string;
+    data: string;
+    topics: string[];
+    index: number;
+    transactionIndex: number;
+    args: any[];
 }
 export declare enum DexType {
     FX = "f(x)"

package/dist/esm/index.d.ts

@@ -1,5 +1,7 @@
-import { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath } from './types.js';
-export { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath };
+import type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath } from './types.js';
+import { ChainNameEnum, AddressConst, DexType } from './types.js';
+export type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath };
+export { ChainNameEnum, AddressConst, DexType };
 declare class Hermes {
     private config;
     private providerMap;

package/dist/esm/index.js

@@ -15,14 +15,15 @@ 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 { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath } from "./types.js";
+import { ChainNameEnum, AddressConst, DexType } from "./types.js";
 import { ethers } from 'ethers';
 import { Contract } from 'ethers';
 import QuoterAbi from "./abis/quoter.js";
 import AggregatorAbi from "./abis/aggregator.js";
 
 // 导出所有类型定义，方便用户使用
-export { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, ChainNameEnum, AddressConst, IExpectPayload, DexType, IRouterPath };
+
+export { ChainNameEnum, AddressConst, DexType };
 var Hermes = /*#__PURE__*/function () {
   function Hermes(config) {
     _classCallCheck(this, Hermes);
@@ -42,7 +43,6 @@ var Hermes = /*#__PURE__*/function () {
         this.walletMap.set(chainName, new ethers.Wallet(rpc.privateKey, provider));
       }
     }
-    console.log(Object.entries(this.config.rpc), this.walletMap);
     for (var _i2 = 0, _Object$entries2 = Object.entries(this.config.quoterAddress); _i2 < _Object$entries2.length; _i2++) {
       var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
         _chainName = _Object$entries2$_i[0],
@@ -246,7 +246,11 @@ var Hermes = /*#__PURE__*/function () {
               return _context2.abrupt("return", {
                 fromToken: fromTokenAddress,
                 toToken: toTokenAddress,
-                amountOut: amountOut
+                amountOut: amountOut,
+                hash: receipt.hash,
+                from: receipt.from,
+                to: receipt.from,
+                logs: receipt.logs
               });
             case 76:
             case "end":
@@ -268,7 +272,15 @@ var Hermes = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.validateParams(params);
-              receipt = {};
+              receipt = {
+                fromToken: params.tokenAddress,
+                toToken: params.tokenAddress,
+                amountOut: params.amountInWei,
+                hash: '',
+                from: '',
+                to: '',
+                logs: []
+              };
               return _context3.abrupt("return", Promise.resolve(receipt));
             case 3:
             case "end":
@@ -290,7 +302,15 @@ var Hermes = /*#__PURE__*/function () {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               this.validateParams(params);
-              receipt = {};
+              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: []
+              };
               return _context4.abrupt("return", Promise.resolve(receipt));
             case 3:
             case "end":

package/dist/esm/types.d.ts

@@ -1,4 +1,4 @@
-import type { BytesLike } from 'ethers';
+import type { BytesLike, JsonRpcProvider } from 'ethers';
 export interface IConfig {
     rpc: Record<string, IRpcConfig>;
     quoterAddress: Record<string, string>;
@@ -39,9 +39,46 @@ export interface ISwapAndBridgeParams {
     extra?: BytesLike;
 }
 export interface IReceipt {
-    fromToken?: string;
-    toToken?: string;
-    amountOut?: bigint;
+    fromToken: string;
+    toToken: string;
+    amountOut: bigint;
+    hash: string;
+    from: string;
+    to: string;
+    logs: ILog[];
+}
+export interface IEthersReceipt {
+    provider: JsonRpcProvider;
+    to: string;
+    from: string;
+    contractAddress: string | null;
+    hash: string;
+    index: number;
+    blockHash: string;
+    blockNumber: number;
+    logsBloom: string;
+    gasUsed: bigint;
+    blobGasUsed: null;
+    cumulativeGasUsed: bigint;
+    gasPrice: bigint;
+    blobGasPrice: null;
+    type: number;
+    status: number;
+    root: undefined;
+    logs: ILog[];
+}
+export interface ILog {
+    provider: JsonRpcProvider;
+    transactionHash: string;
+    blockHash: string;
+    blockNumber: number;
+    removed: undefined;
+    address: string;
+    data: string;
+    topics: string[];
+    index: number;
+    transactionIndex: number;
+    args: any[];
 }
 export declare enum DexType {
     FX = "f(x)"

package/package.json

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