@dhedge/v2-sdk 1.8.2 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",
@@ -21,7 +21,8 @@
     "size": "size-limit",
     "analyze": "size-limit --why",
     "fork:polygon": "hardhat node --fork $(grep POLYGON_URL .env | cut -d '=' -f2)",
-    "fork:optimism": "hardhat node --fork $(grep OPTIMISM_URL .env | cut -d '=' -f2)"
+    "fork:optimism": "hardhat node --fork $(grep OPTIMISM_URL .env | cut -d '=' -f2)",
+    "fork:arbitrum": "hardhat node --fork $(grep ARBITRUM_URL .env | cut -d '=' -f2)"
   },
   "husky": {
     "hooks": {

package/src/abi/IArrakisV1RouterStaking.json

@@ -27,6 +27,11 @@
           "name": "amount1Min",
           "type": "uint256"
         },
+        {
+          "internalType": "uint256",
+          "name": "amountSharesMin",
+          "type": "uint256"
+        },
         {
           "internalType": "address",
           "name": "receiver",

package/src/config.ts

@@ -15,7 +15,8 @@ export const factoryAddress: AddressNetworkMap = {
   [Network.POLYGON]: process.env.STAGING_CONTRACTS
     ? "0xDd87eCdB10cFF7004276AAbAbd30e7a08F69bb53"
     : "0xfdc7b8bFe0DD3513Cc669bB8d601Cb83e2F69cB0",
-  [Network.OPTIMISM]: "0x5e61a079A178f0E5784107a4963baAe0c5a680c6"
+  [Network.OPTIMISM]: "0x5e61a079A178f0E5784107a4963baAe0c5a680c6",
+  [Network.ARBITRUM]: "0xfffb5fb14606eb3a548c113026355020ddf27535"
 };
 
 export const routerAddress: AddressDappNetworkMap = {
@@ -27,7 +28,7 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.QUICKSWAP]: "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff",
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-    [Dapp.ARRAKIS]: "0xbc91a120cCD8F80b819EAF32F0996daC3Fa76a6C",
+    [Dapp.ARRAKIS]: "0xc73fb100a995b33f9fa181d420f4c8d74506df66",
     [Dapp.TOROS]: "0xB2F1498983bf9c9442c35F772e6C1AdE66a8DeDE"
   },
   [Network.OPTIMISM]: {
@@ -38,7 +39,13 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.TOROS]: "0x3988513793bCE39f0167064A9F7fC3617FaF35AB",
     [Dapp.VELODROME]: "0x9c12939390052919aF3155f41Bf4160Fd3666A6f",
     [Dapp.LYRA]: "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B",
-    [Dapp.ARRAKIS]: "0x86d62a8ad19998e315e6242b63eb73f391d4674b"
+    [Dapp.ARRAKIS]: "0x9ce88a56d120300061593eF7AD074A1B710094d5"
+  },
+  [Network.ARBITRUM]: {
+    [Dapp.ONEINCH]: "0x1111111254EEB25477B68fb85Ed929f73A960582",
+    [Dapp.UNISWAPV3]: "0xe592427a0aece92de3edee1f18e0157c05861564",
+    [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
+    [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8"
   }
 };
 
@@ -47,7 +54,8 @@ export const dappFactoryAddress: AddressDappNetworkMap = {
     [Dapp.SUSHISWAP]: "0xc35DADB65012eC5796536bD9864eD8773aBc74C4",
     [Dapp.QUICKSWAP]: "0x5757371414417b8C6CAad45bAeF941aBc7d3Ab32"
   },
-  [Network.OPTIMISM]: {}
+  [Network.OPTIMISM]: {},
+  [Network.ARBITRUM]: {}
 };
 
 export const stakingAddress: AddressDappNetworkMap = {
@@ -57,7 +65,8 @@ export const stakingAddress: AddressDappNetworkMap = {
     [Dapp.AAVE]: "0x357D51124f59836DeD84c8a1730D72B749d8BC23",
     [Dapp.AAVEV3]: "0x929EC64c34a17401F460460D4B9390518E5B473e"
   },
-  [Network.OPTIMISM]: {}
+  [Network.OPTIMISM]: {},
+  [Network.ARBITRUM]: {}
 };
 
 export const aaveAddressProvider: AddressDappNetworkMap = {
@@ -67,27 +76,34 @@ export const aaveAddressProvider: AddressDappNetworkMap = {
   },
   [Network.OPTIMISM]: {
     [Dapp.AAVEV3]: "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb"
+  },
+  [Network.ARBITRUM]: {
+    [Dapp.AAVEV3]: "0xa97684ead0e402dc232d5a977953df7ecbab3cdb"
   }
 };
 export const nonfungiblePositionManagerAddress: AddressNetworkMap = {
   [Network.POLYGON]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
-  [Network.OPTIMISM]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
+  [Network.OPTIMISM]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88",
+  [Network.ARBITRUM]: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
 };
 
 export const networkChainIdMap: NetworkChainIdMap = {
   [Network.POLYGON]: 137,
-  [Network.OPTIMISM]: 10
+  [Network.OPTIMISM]: 10,
+  [Network.ARBITRUM]: 42161
 };
 
 export const balancerSubgraph: AddressNetworkMap = {
   [Network.POLYGON]:
     "https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-polygon-v2",
-  [Network.OPTIMISM]: ""
+  [Network.OPTIMISM]: "",
+  [Network.ARBITRUM]: ""
 };
 
 export const multiCallAddress: AddressNetworkMap = {
   [Network.POLYGON]: "0x275617327c958bD06b5D6b871E7f491D76113dd8",
-  [Network.OPTIMISM]: ""
+  [Network.OPTIMISM]: "",
+  [Network.ARBITRUM]: ""
 };
 
 export const lyraNetworkMap: LyraNetworkMap = {

package/src/entities/pool.ts

@@ -59,6 +59,7 @@ import {
   getFuturesChangePositionTxData,
   getFuturesChangeMarginTxData
 } from "../services/futures";
+import { getFuturesCancelOrderTxData } from "../services/futures/trade";
 
 export class Pool {
   public readonly poolLogic: Contract;
@@ -288,7 +289,11 @@ export class Pool {
       case Dapp.ONEINCH:
         const chainId = networkChainIdMap[this.network];
         const protocols = await getOneInchProtocols(chainId);
-        const apiUrl = `https://api.1inch.exchange/v5.0/${chainId}/swap?fromTokenAddress=${assetFrom}&toTokenAddress=${assetTo}&amount=${amountIn.toString()}&fromAddress=${
+        if (!process.env.ONEINCH_API_URL)
+          throw new Error("ONEINCH_API_URL not configured in .env file");
+        const apiUrl = `${
+          process.env.ONEINCH_API_URL
+        }/${chainId}/swap?fromTokenAddress=${assetFrom}&toTokenAddress=${assetTo}&amount=${amountIn.toString()}&fromAddress=${
           this.address
         }&destReceiver=${
           this.address
@@ -998,6 +1003,7 @@ export class Pool {
         amountB,
         0,
         0,
+        0,
         this.address
       ]);
     } else {
@@ -1250,4 +1256,16 @@ export class Pool {
     const tx = await this.poolLogic.execTransaction(market, txData, options);
     return tx;
   }
+
+  /** Cancels an open oder on Synthetix futures market
+   *
+   * @param {string} market Address of futures market
+   * @param {any} options Transaction options
+   * @returns {Promise<any>} Transaction
+   */
+  async cancelFuturesOrder(market: string, options: any = null): Promise<any> {
+    const txData = await getFuturesCancelOrderTxData(this);
+    const tx = await this.poolLogic.execTransaction(market, txData, options);
+    return tx;
+  }
 }

package/src/services/futures/trade.ts

@@ -24,3 +24,9 @@ export async function getFuturesChangePositionTxData(
     ethers.utils.formatBytes32String(FUTURES_TRACKING)
   ]);
 }
+
+export async function getFuturesCancelOrderTxData(pool: Pool): Promise<string> {
+  return new ethers.utils.Interface(
+    ISynthetixFuturesMarketV2.abi
+  ).encodeFunctionData("cancelOffchainDelayedOrder", [pool.address]);
+}

package/src/test/aave.test.ts

@@ -1,128 +1,87 @@
-import { Dhedge } from "..";
-import { Network } from "../types";
-import { OP, TEST_POOL, USDC, WBTC, WETH } from "./constants";
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { Dhedge, Pool } from "..";
+import { routerAddress } from "../config";
+import { Dapp, Network } from "../types";
+import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { allowanceDelta, balanceDelta } from "./utils/token";
 
 import { wallet } from "./wallet";
 
-let dhedge: Dhedge;
+// const network = Network.OPTIMISM;
+// const network = Network.POLYGON;
+const network = Network.ARBITRUM;
+const USDC = CONTRACT_ADDRESS[network].USDC;
+const WETH = CONTRACT_ADDRESS[network].WETH;
 
+let dhedge: Dhedge;
+let pool: Pool;
 jest.setTimeout(100000);
 
-// const options = {
-//   gasLimit: 5000000,
-//   gasPrice: ethers.utils.parseUnits("100", "gwei")
-// };
-
 describe("pool", () => {
-  beforeAll(() => {
-    dhedge = new Dhedge(wallet, Network.OPTIMISM);
+  beforeAll(async () => {
+    dhedge = new Dhedge(wallet, network);
+    pool = await dhedge.loadPool(TEST_POOL[network]);
   });
 
-  // it("approves USDC to Aave", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     result = await pool.approve(
-  //       Dapp.AAVEV3,
-  //       USDC,
-  //       ethers.constants.MaxUint256
-  //     );
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
-
-  // it("withdraws 1 USDC from Aave lending pool", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(myPool);
-  //   try {
-  //     result = await pool.withdrawDeposit(
-  //       Dapp.AAVE,
-  //       weth,
-  //       "86567951006165",
-  //       options
-  //     );
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
-
-  // it("borrows 0.001 WETH from Aave lending pool", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     result = await pool.borrow(Dapp.AAVEV3, WETH, "1000000000000000");
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
+  it("approves unlimited USDC on Aave Lending pool", async () => {
+    await pool.approve(Dapp.AAVEV3, USDC, MAX_AMOUNT);
+    const usdcAllowanceDelta = await allowanceDelta(
+      pool.address,
+      USDC,
+      routerAddress[network]["aavev3"]!,
+      pool.signer
+    );
+    await expect(usdcAllowanceDelta.gt(0));
+  });
 
-  // it("reapys 1USDC to Aave lending pool", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     result = await pool.repay(Dapp.AAVEV3, USDC, "1380000");
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
+  it("approves unlimited WETH on Aave Lending pool", async () => {
+    await pool.approve(Dapp.AAVEV3, WETH, MAX_AMOUNT);
+    const wethAllowanceDelta = await allowanceDelta(
+      pool.address,
+      USDC,
+      routerAddress[network]["aavev3"]!,
+      pool.signer
+    );
+    await expect(wethAllowanceDelta.gt(0));
+  });
 
-  // it("claims rewards from Aave", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     result = await pool.harvestAaveRewards([AMUSDC, VDEBTWETH], options);
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
+  it("lends 5 USDC into Aave lending pool", async () => {
+    await pool.lend(Dapp.AAVEV3, USDC, "5000000");
+    const usdcBalanceDelta = await balanceDelta(
+      pool.address,
+      USDC,
+      pool.signer
+    );
+    expect(usdcBalanceDelta.eq("-5000000"));
+  });
 
-  // it("lends USDC to Aave", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     const balance = await dhedge.utils.getBalance(WETH, pool.address);
-  //     result = await pool.lend(Dapp.AAVEV3, WETH, balance, 196);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
+  it("it borrows 0.001 WETH from Aave lending pool", async () => {
+    await pool.borrow(Dapp.AAVEV3, WETH, "1000000000000000");
+    const wethBalanceDelta = await balanceDelta(
+      pool.address,
+      WETH,
+      pool.signer
+    );
+    expect(wethBalanceDelta.eq("1000000000000000"));
+  });
 
-  // it("gets Aave assets for underlying", async () => {
-  //   let result;
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   try {
-  //     result = await getAaveAssetsForUnderlying(pool, Dapp.AAVEV3, [
-  //       USDC,
-  //       WETH
-  //     ]);
-  //     console.log(result);
-  //   } catch (e) {
-  //     console.log(e);
-  //   }
-  //   expect(result).not.toBe(null);
-  // });
+  it("it repays 0.001 WETH to Aave lending pool", async () => {
+    await pool.repay(Dapp.AAVEV3, WETH, "1000000000000000");
+    const wethBalanceDelta = await balanceDelta(
+      pool.address,
+      WETH,
+      pool.signer
+    );
+    expect(wethBalanceDelta.eq("-1000000000000000"));
+  });
 
-  it("claims rewards from AaveV3", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL);
-    try {
-      result = await pool.harvestAaveV3Rewards([USDC, WETH, WBTC], OP);
-      console.log(result);
-    } catch (e) {
-      console.log(e);
-    }
-    expect(result).not.toBe(null);
+  it("it withdraws 4 USDC from Aave lending pool", async () => {
+    await pool.withdrawDeposit(Dapp.AAVEV3, USDC, "4000000");
+    const usdcBalanceDelta = await balanceDelta(
+      pool.address,
+      WETH,
+      pool.signer
+    );
+    expect(usdcBalanceDelta.eq("4000000"));
   });
 });

package/src/test/arrakis.test.ts

@@ -1,102 +1,95 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Dhedge, ethers } from "..";
+import { Dhedge, Pool } from "..";
+import { routerAddress } from "../config";
 import { Dapp, Network } from "../types";
-import { ARRAKIS_USDC_WETH_GAUGE, TEST_POOL, USDC, WETH } from "./constants";
-import { getTxOptions } from "./txOptions";
+import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import { allowanceDelta, balanceDelta } from "./utils/token";
 
 import { wallet } from "./wallet";
 
+//const network = Network.OPTIMISM;
+const network = Network.POLYGON;
+const USDC = CONTRACT_ADDRESS[network].USDC;
+const WETH = CONTRACT_ADDRESS[network].WETH;
+
 let dhedge: Dhedge;
-let options: any;
+let pool: Pool;
 jest.setTimeout(100000);
 
 describe("pool", () => {
   beforeAll(async () => {
-    dhedge = new Dhedge(wallet, Network.OPTIMISM);
-    options = await getTxOptions(Network.OPTIMISM);
+    dhedge = new Dhedge(wallet, network);
+    pool = await dhedge.loadPool(TEST_POOL[network]);
+    await pool.approve(Dapp.ONEINCH, USDC, MAX_AMOUNT);
+    await pool.trade(Dapp.ONEINCH, USDC, WETH, "1000000", 0.5);
   });
 
   it("approves unlimited USDC on Arrakis", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const result = await pool.approve(
-      Dapp.ARRAKIS,
+    await pool.approve(Dapp.ARRAKIS, USDC, MAX_AMOUNT);
+    const usdcAllowanceDelta = await allowanceDelta(
+      pool.address,
       USDC,
-      ethers.constants.MaxInt256,
-      options
+      routerAddress[network].arrakis!,
+      pool.signer
     );
-    expect(result).not.toBe(null);
+    await expect(usdcAllowanceDelta.gt(0));
   });
 
   it("approves unlimited WETH on Arrakis", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const result = await pool.approve(
-      Dapp.ARRAKIS,
-      WETH,
-      ethers.constants.MaxInt256,
-      options
+    await pool.approve(Dapp.ARRAKIS, WETH, MAX_AMOUNT);
+    const wethAllowanceDelta = await allowanceDelta(
+      pool.address,
+      USDC,
+      routerAddress[network].arrakis!,
+      pool.signer
     );
-    console.log(result);
-    expect(result).not.toBe(null);
+    await expect(wethAllowanceDelta.gt(0));
   });
 
   it("should add liquidity and stake in an WETH/USDC Arrakis pool", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
+    const usdcBalance = await pool.utils.getBalance(USDC, pool.address);
     const wethBalance = await pool.utils.getBalance(WETH, pool.address);
-    const uasdBalance = await pool.utils.getBalance(USDC, pool.address);
-    const lpBalance = await pool.utils.getBalance(
-      ARRAKIS_USDC_WETH_GAUGE,
-      pool.address
-    );
-    const result = await pool.increaseLiquidity(
+    await pool.increaseLiquidity(
       Dapp.ARRAKIS,
-      ARRAKIS_USDC_WETH_GAUGE,
-      uasdBalance,
-      wethBalance,
-      options
+      CONTRACT_ADDRESS[network].ARRAKIS_USDC_WETH_GAUGE,
+      usdcBalance,
+      wethBalance
     );
-    result.wait(1);
-    const lpBalanceAfter = await pool.utils.getBalance(
-      ARRAKIS_USDC_WETH_GAUGE,
-      pool.address
+    const lpBalanceDelta = await balanceDelta(
+      pool.address,
+      CONTRACT_ADDRESS[network].ARRAKIS_USDC_WETH_LP,
+      pool.signer
     );
-    expect(lpBalanceAfter.gt(lpBalance));
+    expect(lpBalanceDelta.gt(0));
   });
 
-  it("approves unlimited LP staking Token before on  Arrakis", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const result = await pool.approve(
+  it("approves unlimited LP staking Token before on Arrakis", async () => {
+    await pool.approve(
       Dapp.ARRAKIS,
-      ARRAKIS_USDC_WETH_GAUGE,
-      ethers.constants.MaxInt256,
-      options
+      CONTRACT_ADDRESS[network].ARRAKIS_USDC_WETH_GAUGE,
+      MAX_AMOUNT
+    );
+    const gaugeAllowanceDelta = await allowanceDelta(
+      pool.address,
+      CONTRACT_ADDRESS[network].ARRAKIS_USDC_WETH_GAUGE,
+      routerAddress[network].arrakis!,
+      pool.signer
     );
-    expect(result).not.toBe(null);
+    await expect(gaugeAllowanceDelta.gt(0));
   });
 
   it("should remove liquidity from an existing pool ", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const result = await pool.decreaseLiquidity(
+    await pool.decreaseLiquidity(
       Dapp.ARRAKIS,
-      ARRAKIS_USDC_WETH_GAUGE,
-      100,
-      options
+      CONTRACT_ADDRESS[network].ARRAKIS_USDC_WETH_GAUGE,
+      100
     );
-    result.wait(1);
-    const lpBalanceAfter = await pool.utils.getBalance(
-      ARRAKIS_USDC_WETH_GAUGE,
-      pool.address
+    const wethBalanceDelta = await balanceDelta(
+      pool.address,
+      CONTRACT_ADDRESS[network].WETH,
+      pool.signer
     );
-    expect(lpBalanceAfter.eq(0));
+    expect(wethBalanceDelta.gt(0));
   });
-
-  // it("should claim fees an existing pool", async () => {
-  //   const pool = await dhedge.loadPool(TEST_POOL);
-  //   const result = await pool.claimFees(
-  //     Dapp.ARRAKIS,
-  //     ARRAKIS_USDC_WETH_GAUGE,
-  //     options
-  //   );
-  //   console.log("result", result);
-  //   expect(result).not.toBe(null);
-  // });
 });