@dhedge/v2-sdk 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",

package/src/entities/dhedge.ts

@@ -88,7 +88,6 @@ export class Dhedge {
    * @returns {Pool} Loaded Pool
    */
   public async loadPool(address: string): Promise<Pool> {
-    this.validatePool(address);
     const poolLogic = new Contract(address, PoolLogic.abi, this.signer);
     const managerLogicAddress = await poolLogic.poolManagerLogic();
     const managerLogic = new Contract(
@@ -106,14 +105,4 @@ export class Dhedge {
       this.factory
     );
   }
-
-  /**
-   * Check if pool address is valid
-   * @param {string} address Pool address
-   * @returns {boolean} Is valid pool address
-   */
-  private async validatePool(address: string): Promise<void> {
-    const isPool = await this.factory.isPool(address);
-    if (!isPool) throw new Error("Given address not a pool");
-  }
 }

package/src/test/1inch.test.ts

@@ -0,0 +1,54 @@
+import { Dhedge } from "..";
+import { Dapp, Network } from "../types";
+import { TEST_POOL, USDC, WETH } from "./constants";
+import { getTxOptions } from "./txOptions";
+
+import { wallet } from "./wallet";
+
+let dhedge: Dhedge;
+let options: any;
+
+jest.setTimeout(100000);
+
+describe("pool", () => {
+  beforeAll(async () => {
+    dhedge = new Dhedge(wallet, Network.OPTIMISM);
+    options = await getTxOptions(Network.OPTIMISM);
+  });
+
+  //   it("approves unlimited USDC on 1Inch", async () => {
+  //     let result;
+  //     const pool = await dhedge.loadPool(TEST_POOL);
+  //     try {
+  //       result = await pool.approve(
+  //         Dapp.ONEINCH,
+  //         USDC,
+  //         ethers.constants.MaxInt256,
+  //         options
+  //       );
+  //       console.log(result);
+  //     } catch (e) {
+  //       console.log(e);
+  //     }
+  //     expect(result).not.toBe(null);
+  //   });
+
+  it("trades 1 USDC into WETH on 1Inch", async () => {
+    let result;
+    const pool = await dhedge.loadPool(TEST_POOL);
+    try {
+      result = await pool.trade(
+        Dapp.ONEINCH,
+        USDC,
+        WETH,
+        "1000000",
+        0.5,
+        options
+      );
+      console.log(result);
+    } catch (e) {
+      console.log(e);
+    }
+    expect(result).not.toBe(null);
+  });
+});

package/src/test/constants.ts

@@ -1,23 +1,23 @@
 //Polygon
-export const USDC = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
-export const WETH = "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619";
-export const USDT = "0xc2132D05D31c914a87C6611C10748AEb04B58e8F";
-export const DAI = "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063";
-export const TUSD = "0x2e1ad108ff1d8c782fcbbb89aad783ac49586756";
-export const WBTC = "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6";
-export const SUSHI = "0x0b3f868e0be5597d5db7feb59e1cadbb0fdda50a";
-export const WMATIC = "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270";
-export const BAL = "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3";
-export const AMUSDC = "0x1a13f4ca1d028320a707d99520abfefca3998b7f";
-export const VDEBTWETH = "0xede17e9d79fc6f9ff9250d9eefbdb88cc18038b5";
-export const ARRAKIS_USDC_WETH_GAUGE =
-  "0x33d1ad9Cd88A509397CD924C2d7613C285602C20";
-export const STMATIC = "0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4";
-export const WMATIC_STMATIC_LP = "0xaF5E0B5425dE1F5a630A8cB5AA9D97B8141C908D";
+// export const USDC = "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174";
+// export const WETH = "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619";
+// export const USDT = "0xc2132D05D31c914a87C6611C10748AEb04B58e8F";
+// export const DAI = "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063";
+// export const TUSD = "0x2e1ad108ff1d8c782fcbbb89aad783ac49586756";
+// export const WBTC = "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6";
+// export const SUSHI = "0x0b3f868e0be5597d5db7feb59e1cadbb0fdda50a";
+// export const WMATIC = "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270";
+// export const BAL = "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3";
+// export const AMUSDC = "0x1a13f4ca1d028320a707d99520abfefca3998b7f";
+// export const VDEBTWETH = "0xede17e9d79fc6f9ff9250d9eefbdb88cc18038b5";
+// export const ARRAKIS_USDC_WETH_GAUGE =
+//   "0x33d1ad9Cd88A509397CD924C2d7613C285602C20";
+// export const STMATIC = "0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4";
+// export const WMATIC_STMATIC_LP = "0xaF5E0B5425dE1F5a630A8cB5AA9D97B8141C908D";
 
 //Optimism
-// export const WETH = "0x4200000000000000000000000000000000000006";
-// export const USDC = "0x7F5c764cBc14f9669B88837ca1490cCa17c31607";
-// export const DAI = "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1";
+export const WETH = "0x4200000000000000000000000000000000000006";
+export const USDC = "0x7F5c764cBc14f9669B88837ca1490cCa17c31607";
+export const DAI = "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1";
 
 export const TEST_POOL = "TEST_POOL_ADDRESS";

package/src/test/txOptions.ts

@@ -1,15 +1,21 @@
 import axios from "axios";
 import BigNumber from "bignumber.js";
+import { Network } from "../types";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const getTxOptions = async (): Promise<any> => {
-  const result = await axios("https://gasstation-mainnet.matic.network/v2");
-
-  return {
-    gasLimit: "3000000",
-    maxPriorityFeePerGas: new BigNumber(result.data.fast.maxPriorityFee)
-      .shiftedBy(9)
-      .toFixed(0),
-    maxFeePerGas: new BigNumber(result.data.fast.maxFee).shiftedBy(9).toFixed(0)
-  };
+export const getTxOptions = async (network: Network): Promise<any> => {
+  if (network === Network.POLYGON) {
+    const result = await axios("https://gasstation-mainnet.matic.network/v2");
+    return {
+      gasLimit: "3000000",
+      maxPriorityFeePerGas: new BigNumber(result.data.fast.maxPriorityFee)
+        .shiftedBy(9)
+        .toFixed(0),
+      maxFeePerGas: new BigNumber(result.data.fast.maxFee)
+        .shiftedBy(9)
+        .toFixed(0),
+    };
+  } else {
+    return { gasLimit: "3000000" };
+  }
 };