@dhedge/v2-sdk 1.9.6 → 1.9.8

package/src/test/uniswap.test.ts

@@ -2,7 +2,7 @@
 import { FeeAmount } from "@uniswap/v3-sdk";
 import { Dhedge, ethers, Pool } from "..";
 import { routerAddress } from "../config";
-import { Dapp, Network } from "../types";
+import { AssetEnabled, Dapp, Network } from "../types";
 import { CONTRACT_ADDRESS, TEST_POOL } from "./constants";
 import { allowanceDelta, balanceDelta } from "./utils/token";
 import {
@@ -11,12 +11,15 @@ import {
   TestingRunParams
 } from "./utils/testingHelper";
 import BigNumber from "bignumber.js";
+import INonfungiblePositionManager from "../abi/INonfungiblePositionManager.json";
 
 const testUniswapV3 = ({ wallet, network, provider }: TestingRunParams) => {
   let dhedge: Dhedge;
   let pool: Pool;
+  let nonfungiblePositionManager: ethers.Contract;
+  let tokenId: ethers.BigNumber;
 
-  jest.setTimeout(100000);
+  jest.setTimeout(600000);
   describe(`testUniswapV3 on ${network}`, () => {
     beforeAll(async () => {
       dhedge = new Dhedge(wallet, network);
@@ -29,11 +32,27 @@ const testUniswapV3 = ({ wallet, network, provider }: TestingRunParams) => {
       ]);
       await provider.send("evm_mine", []);
       await setUSDCAmount({
-        amount: new BigNumber(100).times(1e18).toFixed(0),
+        amount: new BigNumber(1000000).times(1e6).toFixed(0),
         userAddress: pool.address,
         network,
         provider
       });
+
+      const newAssets: AssetEnabled[] = [
+        { asset: CONTRACT_ADDRESS[network].USDC, isDeposit: true },
+        { asset: CONTRACT_ADDRESS[network].WETH, isDeposit: true },
+        {
+          asset: CONTRACT_ADDRESS[network].uniswapV3.nonfungiblePositionManager,
+          isDeposit: false
+        }
+      ];
+      await pool.changeAssets(newAssets);
+
+      nonfungiblePositionManager = new ethers.Contract(
+        CONTRACT_ADDRESS[network].uniswapV3.nonfungiblePositionManager,
+        INonfungiblePositionManager.abi,
+        pool.signer
+      );
     });
 
     it("approves unlimited USDC on for trading on UniswapV3", async () => {
@@ -52,11 +71,11 @@ const testUniswapV3 = ({ wallet, network, provider }: TestingRunParams) => {
       expect(UsdcAllowanceDelta.gte(0));
     });
 
-    it("should swap 5 USDC into WETH on UniswapV3", async () => {
+    it("should swap 5000 USDC into WETH on UniswapV3", async () => {
       await pool.tradeUniswapV3(
         CONTRACT_ADDRESS[network].USDC,
         CONTRACT_ADDRESS[network].WETH,
-        "5000000",
+        new BigNumber(5000).times(1e6).toFixed(0),
         FeeAmount.LOW,
         0.5
       );
@@ -69,78 +88,88 @@ const testUniswapV3 = ({ wallet, network, provider }: TestingRunParams) => {
       expect(wethAllowanceDelta.gt(0));
     });
 
-    // it("approves unlimited WETH on for UniswapV3 LP", async () => {
-    //   await pool.approveUniswapV3Liquidity(
-    //     CONTRACT_ADDRESS[network].USDC,
-    //     ethers.constants.MaxInt256
-    //   );
-    //   const UsdcAllowanceDelta = await allowanceDelta(
-    //     pool.address,
-    //     CONTRACT_ADDRESS[network].USDC,
-    //     pool.address,
-    //     pool.signer
-    //   );
+    it("approves unlimited WETH on for UniswapV3 LP", async () => {
+      await pool.approveUniswapV3Liquidity(
+        CONTRACT_ADDRESS[network].USDC,
+        ethers.constants.MaxInt256
+      );
+      await pool.approveUniswapV3Liquidity(
+        CONTRACT_ADDRESS[network].WETH,
+        ethers.constants.MaxInt256
+      );
+      const UsdcAllowanceDelta = await allowanceDelta(
+        pool.address,
+        CONTRACT_ADDRESS[network].USDC,
+        pool.address,
+        pool.signer
+      );
 
-    //   expect(result).not.toBe(null);
-    // });
+      expect(UsdcAllowanceDelta).not.toBe(null);
+    });
 
-    // it("adds WETH and WBTC to a new V3 pool", async () => {
-    //   let result;
-    //   const pool = await dhedge.loadPool(TEST_POOL);
-    //   const usdcBalance = await dhedge.utils.getBalance(USDC, pool.address);
-    //   const wethBalance = await dhedge.utils.getBalance(WETH, pool.address);
+    it("adds WETH and USDC to a new V3 pool", async () => {
+      let result = null;
+      const pool = await dhedge.loadPool(TEST_POOL[network]);
+      const usdcBalance = await dhedge.utils.getBalance(
+        CONTRACT_ADDRESS[network].USDC,
+        pool.address
+      );
+      const wethBalance = await dhedge.utils.getBalance(
+        CONTRACT_ADDRESS[network].WETH,
+        pool.address
+      );
 
-    //   try {
-    //     result = await pool.addLiquidityUniswapV3(
-    //       USDC,
-    //       WETH,
-    //       usdcBalance,
-    //       wethBalance,
-    //       0.0003,
-    //       0.0004,
-    //       null,
-    //       null,
-    //       FeeAmount.LOW,
-    //       options
-    //     );
-    //     console.log(result);
-    //   } catch (e) {
-    //     console.log(e);
-    //   }
-    //   expect(result).not.toBe(null);
-    // });
+      try {
+        result = await pool.addLiquidityUniswapV3(
+          CONTRACT_ADDRESS[network].WETH,
+          CONTRACT_ADDRESS[network].USDC,
+          wethBalance,
+          usdcBalance,
+          2000,
+          3000,
+          null,
+          null,
+          FeeAmount.LOW
+          // options
+        );
+        await result.wait(1);
+
+        tokenId = await nonfungiblePositionManager.tokenOfOwnerByIndex(
+          pool.address,
+          0
+        );
+      } catch (e) {
+        console.log("e", e);
+      }
+      expect(result).not.toBe(null);
+    });
 
-    // it("should remove liquidity from an existing pool ", async () => {
-    //   const pool = await dhedge.loadPool(TEST_POOL);
-    //   const result = await pool.decreaseLiquidity(
-    //     Dapp.UNISWAPV3,
-    //     "110507",
-    //     100,
-    //     options
-    //   );
-    //   console.log("result", result);
-    //   expect(result).not.toBe(null);
-    // });
+    it("should remove liquidity from an existing pool ", async () => {
+      const result = await pool.decreaseLiquidity(
+        Dapp.UNISWAPV3,
+        tokenId.toString(),
+        50 // precent
+      );
+      // console.log("result", result);
+      expect(result).not.toBe(null);
+    });
 
-    // it("should increase liquidity in an existing pool WETH/WBTC pool", async () => {
-    //   const pool = await dhedge.loadPool(TEST_POOL);
-    //   const result = await pool.increaseLiquidity(
-    //     Dapp.UNISWAPV3,
-    //     "110507",
-    //     "244838",
-    //     "258300000000000",
-    //     options
-    //   );
-    //   console.log("result", result);
-    //   expect(result).not.toBe(null);
-    // });
+    it("should increase liquidity in the existing WETH/USDC pool", async () => {
+      const result = await pool.increaseLiquidity(
+        Dapp.UNISWAPV3,
+        tokenId.toString(),
+        new BigNumber(3000).times(1e6).toFixed(0), // usdc
+        new BigNumber(1).times(1e18).toFixed(0) // eth
+      );
+      // console.log("result", result);
+      expect(result).not.toBe(null);
+    });
 
-    // it("should claim fees an existing pool", async () => {
-    //   const pool = await dhedge.loadPool(TEST_POOL);
-    //   const result = await pool.claimFeesUniswapV3("54929", options);
-    //   console.log("result", result);
-    //   expect(result).not.toBe(null);
-    // });
+    it("should claim fees an existing pool", async () => {
+      const result = await pool.claimFees(Dapp.UNISWAPV3, tokenId.toString());
+      // console.log("result", result);
+      expect(result).not.toBe(null);
+    });
 
     // it("approves unlimited USDC to swap on UniswapV3", async () => {
     //   let result;
@@ -187,6 +216,6 @@ testingHelper({
 });
 
 testingHelper({
-  network: Network.BASE,
+  network: Network.ARBITRUM,
   testingRun: testUniswapV3
 });

package/src/types.ts

@@ -23,7 +23,8 @@ export enum Dapp {
   VELODROMEV2 = "velodromeV2",
   LYRA = "lyra",
   ZEROEX = "0x",
-  RAMSES = "ramses"
+  RAMSES = "ramses",
+  AERODROME = "aerodrome"
 }
 
 export enum Transaction {

package/dist/utils/index.d.ts

@@ -1,7 +0,0 @@
-import BigNumber from "bignumber.js";
-import { MerkleTree } from "./merkle";
-export declare function scale(input: BigNumber | string, decimalPlaces: number): BigNumber;
-export declare function loadTree(balances: {
-    [x: string]: string | BigNumber;
-}, decimals?: number): MerkleTree;
-export declare function bnum(val: string | number | BigNumber): BigNumber;

package/dist/utils/merkle.d.ts

@@ -1,22 +0,0 @@
-/// <reference types="node" />
-import BigNumber from "bignumber.js";
-export declare class MerkleTree {
-    elements: any;
-    layers: any;
-    constructor(elements: any[]);
-    getLayers(elements: string | any[]): (string | any[])[];
-    getNextLayer(elements: any[]): any[];
-    combinedHash(first: any, second: any): any;
-    getRoot(): any;
-    getHexRoot(): string;
-    getProof(el: any): any;
-    getHexProof(_el: any): string[];
-    getPairElement(idx: number, layer: string | any[]): any;
-    bufIndexOf(el: string | any[], arr: string | any[]): number;
-    bufDedup(elements: any[]): any[];
-    bufArrToHexArr(arr: any[]): string[];
-    sortAndConcat(...args: any[]): Buffer;
-}
-export declare function loadTree(balances: {
-    [x: string]: string | BigNumber;
-}, decimals?: number): MerkleTree;

package/src/utils/index.ts

@@ -1,38 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-import BigNumber from "bignumber.js";
-import { soliditySha3 } from "web3-utils";
-import { MerkleTree } from "./merkle";
-
-export function scale(
-  input: BigNumber | string,
-  decimalPlaces: number
-): BigNumber {
-  const unscaled = typeof input === "string" ? new BigNumber(input) : input;
-  const scalePow = new BigNumber(decimalPlaces.toString());
-  const scaleMul = new BigNumber(10).pow(scalePow);
-  return unscaled.times(scaleMul);
-}
-
-export function loadTree(
-  balances: { [x: string]: string | BigNumber },
-  decimals = 18
-) {
-  const elements: any[] = [];
-  Object.keys(balances).forEach(address => {
-    const balance: string = scale(balances[address], decimals).toString(10);
-    const leaf = soliditySha3(
-      { t: "address", v: address },
-      { t: "uint", v: balance }
-    );
-    // @ts-ignore
-    elements.push(leaf);
-  });
-  return new MerkleTree(elements);
-}
-
-export function bnum(val: string | number | BigNumber): BigNumber {
-  const number = typeof val === "string" ? val : val ? val.toString() : "0";
-  return new BigNumber(number);
-}

package/src/utils/merkle.ts

@@ -1,172 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// Shamelessly adapted from OpenZeppelin-contracts test utils
-import BigNumber from "bignumber.js";
-import { keccak256, keccakFromString, bufferToHex } from "ethereumjs-util";
-import { hexToBytes, soliditySha3 } from "web3-utils";
-import { scale } from "./index";
-
-// Merkle tree called with 32 byte hex values
-export class MerkleTree {
-  public elements: any;
-  public layers: any;
-
-  constructor(elements: any[]) {
-    this.elements = elements
-      .filter((el: any) => el)
-      .map(el => Buffer.from(hexToBytes(el)));
-
-    // Sort elements
-    this.elements.sort(Buffer.compare);
-    // Deduplicate elements
-    this.elements = this.bufDedup(this.elements);
-
-    // Create layers
-    this.layers = this.getLayers(this.elements);
-  }
-
-  getLayers(elements: string | any[]) {
-    if (elements.length === 0) {
-      return [[""]];
-    }
-
-    const layers = [];
-    layers.push(elements);
-
-    // Get next layer until we reach the root=
-    while (layers[layers.length - 1].length > 1) {
-      // @ts-ignore
-      layers.push(this.getNextLayer(layers[layers.length - 1]));
-    }
-
-    return layers;
-  }
-
-  getNextLayer(elements: any[]) {
-    return elements.reduce(
-      (layer: any[], el: any, idx: number, arr: { [x: string]: any }) => {
-        if (idx % 2 === 0) {
-          // Hash the current element with its pair element
-          layer.push(this.combinedHash(el, arr[idx + 1]));
-        }
-
-        return layer;
-      },
-      []
-    );
-  }
-
-  combinedHash(first: any, second: any) {
-    if (!first) {
-      return second;
-    }
-    if (!second) {
-      return first;
-    }
-
-    return keccak256(this.sortAndConcat(first, second));
-  }
-
-  getRoot() {
-    return this.layers[this.layers.length - 1][0];
-  }
-
-  getHexRoot() {
-    return bufferToHex(this.getRoot());
-  }
-
-  getProof(el: any) {
-    let idx = this.bufIndexOf(el, this.elements);
-
-    if (idx === -1) {
-      throw new Error("Element does not exist in Merkle tree");
-    }
-
-    return this.layers.reduce((proof: any[], layer: any) => {
-      const pairElement = this.getPairElement(idx, layer);
-
-      if (pairElement) {
-        proof.push(pairElement);
-      }
-
-      idx = Math.floor(idx / 2);
-
-      return proof;
-    }, []);
-  }
-
-  // external call - convert to buffer
-  getHexProof(_el: any) {
-    const el = Buffer.from(hexToBytes(_el));
-
-    const proof = this.getProof(el);
-
-    return this.bufArrToHexArr(proof);
-  }
-
-  getPairElement(idx: number, layer: string | any[]) {
-    const pairIdx = idx % 2 === 0 ? idx + 1 : idx - 1;
-
-    if (pairIdx < layer.length) {
-      return layer[pairIdx];
-    } else {
-      return null;
-    }
-  }
-
-  bufIndexOf(el: string | any[], arr: string | any[]) {
-    let hash;
-
-    // Convert element to 32 byte hash if it is not one already
-    if (el.length !== 32 || !Buffer.isBuffer(el)) {
-      hash = keccakFromString(el as string);
-    } else {
-      hash = el;
-    }
-
-    for (let i = 0; i < arr.length; i++) {
-      if (hash.equals(arr[i])) {
-        return i;
-      }
-    }
-
-    return -1;
-  }
-
-  bufDedup(elements: any[]) {
-    return elements.filter((el: any, idx: number) => {
-      return idx === 0 || !elements[idx - 1].equals(el);
-    });
-  }
-
-  bufArrToHexArr(arr: any[]) {
-    if (arr.some((el: any) => !Buffer.isBuffer(el))) {
-      throw new Error("Array is not an array of buffers");
-    }
-
-    return arr.map(
-      (el: { toString: (arg0: string) => string }) => "0x" + el.toString("hex")
-    );
-  }
-
-  sortAndConcat(...args: any[]) {
-    return Buffer.concat([...args].sort(Buffer.compare));
-  }
-}
-
-export function loadTree(
-  balances: { [x: string]: string | BigNumber },
-  decimals = 18
-) {
-  const elements: (string | null)[] = [];
-  Object.keys(balances).forEach(address => {
-    const balance: string = scale(balances[address], decimals).toString(10);
-    const leaf = soliditySha3(
-      { t: "address", v: address },
-      { t: "uint", v: balance }
-    );
-    elements.push(leaf);
-  });
-  return new MerkleTree(elements);
-}