@dhedge/v2-sdk 1.7.2 → 1.8.1

package/src/test/velodrome.test.ts

@@ -1,141 +1,114 @@
+/* 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 { TEST_POOL, VEL, WETH, WSTETH } 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 wETHwstETHLp = "0xBf205335De602ac38244F112d712ab04CB59A498";
-const wETHwstETHGauge = "0x131Ae347E654248671Afc885F0767cB605C065d7";
+const USDC_SUSD_Lp = "0xd16232ad60188b68076a235c65d692090caba155";
+const USDC_SUSD_Gauge = "0xb03f52d2db3e758dd49982defd6aeefea9454e80";
+const network = Network.OPTIMISM;
+const SUSD = CONTRACT_ADDRESS[network].SUSD;
+const USDC = CONTRACT_ADDRESS[network].USDC;
 
 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]);
   });
 
-  it("approves unlimited WETH on for Velodrome", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL);
-    try {
-      result = await pool.approve(
-        Dapp.VELODROME,
-        WSTETH,
-        ethers.constants.MaxInt256,
-        options
-      );
-      console.log(result);
-    } catch (e) {
-      console.log(e);
-    }
-    expect(result).not.toBe(null);
+  it("approves unlimited sUSD and USDC on for Velodrome", async () => {
+    await pool.approve(Dapp.VELODROME, SUSD, MAX_AMOUNT);
+    await pool.approve(Dapp.VELODROME, USDC, MAX_AMOUNT);
+    const UsdcAllowanceDelta = await allowanceDelta(
+      pool.address,
+      USDC,
+      routerAddress[network].velodrome!,
+      pool.signer
+    );
+    await expect(UsdcAllowanceDelta.gt(0));
   });
 
-  it("adds WETH and wstETH to a Velodrome stable pool", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const wethBalance = await dhedge.utils.getBalance(WETH, pool.address);
-    const stwethBalance = await dhedge.utils.getBalance(WSTETH, pool.address);
-
-    const result = await pool.addLiquidityVelodrome(
-      WETH,
-      WSTETH,
-      wethBalance,
-      stwethBalance,
-      true,
-      options
+  it("adds USDC and SUSD to a Velodrome stable pool", async () => {
+    await pool.addLiquidityVelodrome(
+      USDC,
+      SUSD,
+      (5 * 1e6).toString(),
+      (5 * 1e18).toString(),
+      true
     );
 
-    result.wait(1);
-    const lpBalance = await dhedge.utils.getBalance(wETHwstETHLp, pool.address);
-    expect(lpBalance.gt(0));
+    const lpTokenDelta = await balanceDelta(
+      pool.address,
+      USDC_SUSD_Lp,
+      pool.signer
+    );
+    expect(lpTokenDelta.gt(0));
   });
 
-  it("should stake wETH/wStETH LP in a gauge", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const balance = await dhedge.utils.getBalance(wETHwstETHLp, pool.address);
-    const result = await pool.stakeInGauge(
-      Dapp.VELODROME,
-      wETHwstETHGauge,
-      balance,
-      options
-    );
-    result.wait(1);
-    const gaugeBalance = await dhedge.utils.getBalance(
-      wETHwstETHGauge,
-      pool.address
+  it("should stake USDC-sUSD LP in a gauge", async () => {
+    const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
+    await pool.approveSpender(USDC_SUSD_Gauge, USDC_SUSD_Lp, MAX_AMOUNT);
+    await pool.stakeInGauge(Dapp.VELODROME, USDC_SUSD_Gauge, balance);
+    const gaugeBalance = await balanceDelta(
+      pool.address,
+      USDC_SUSD_Lp,
+      pool.signer
     );
     expect(gaugeBalance.gt(0));
   });
 
   it("should claim rewards from Gauge", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const result = await pool.claimFees(
-      Dapp.VELODROME,
-      wETHwstETHGauge,
-      options
-    );
-    result.wait(1);
-    const velBalance = await dhedge.utils.getBalance(VEL, pool.address);
-    expect(velBalance.gt(0));
+    const tx = await pool.claimFees(Dapp.VELODROME, USDC_SUSD_Gauge);
+    expect(tx).not.toBe(null);
   });
 
-  it("should unStake wETH/wStETH LP from a gauge", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
+  it("should unStake USDC-sUSD LP from a gauge", async () => {
     const gaugeBalance = await dhedge.utils.getBalance(
-      wETHwstETHGauge,
+      USDC_SUSD_Gauge,
       pool.address
     );
-    const result = await pool.unstakeFromGauge(
-      wETHwstETHGauge,
-      gaugeBalance,
-      options
-    );
-    result.wait(1);
-    const lpBalance = await dhedge.utils.getBalance(wETHwstETHLp, pool.address);
-    expect(lpBalance.gt(0));
-    const gaugeBalanceAfter = await dhedge.utils.getBalance(
-      wETHwstETHGauge,
-      pool.address
+    await pool.unstakeFromGauge(USDC_SUSD_Gauge, gaugeBalance);
+    const lpTokenDelta = await balanceDelta(
+      pool.address,
+      USDC_SUSD_Lp,
+      pool.signer
     );
-    expect(gaugeBalanceAfter.eq(0));
+    expect(lpTokenDelta.gt(0));
   });
 
   it("approves unlimited wETH/stwETH LP for Velodrome", async () => {
-    let result;
-    const pool = await dhedge.loadPool(TEST_POOL);
-    try {
-      result = await pool.approve(
-        Dapp.VELODROME,
-        wETHwstETHLp,
-        ethers.constants.MaxInt256,
-        options
-      );
-      console.log(result);
-    } catch (e) {
-      console.log(e);
-    }
-    expect(result).not.toBe(null);
+    await pool.approve(Dapp.VELODROME, USDC_SUSD_Lp, MAX_AMOUNT);
+    const lpAllowanceDelta = await allowanceDelta(
+      pool.address,
+      USDC_SUSD_Lp,
+      routerAddress[network].velodrome!,
+      pool.signer
+    );
+    expect(lpAllowanceDelta.gt(0));
   });
 
   it("should remove all liquidity from an existing pool ", async () => {
-    const pool = await dhedge.loadPool(TEST_POOL);
-    const balance = await dhedge.utils.getBalance(wETHwstETHLp, pool.address);
-    const result = await pool.removeLiquidityVelodrome(
-      WETH,
-      WSTETH,
-      balance,
-      options
+    const balance = await dhedge.utils.getBalance(USDC_SUSD_Lp, pool.address);
+    await pool.removeLiquidityVelodrome(USDC, SUSD, balance, true);
+    const usdcBalanceDelta = await balanceDelta(
+      pool.address,
+      USDC,
+      pool.signer
     );
-    result.wait(1);
-    const balanceAfter = await dhedge.utils.getBalance(
-      wETHwstETHLp,
-      pool.address
+    const susdBalanceDelta = await balanceDelta(
+      pool.address,
+      SUSD,
+      pool.signer
     );
-    expect(balanceAfter.eq(0));
+    expect(usdcBalanceDelta.gt(0));
+    expect(susdBalanceDelta.gt(0));
   });
 });

package/src/test/wallet.ts

@@ -3,9 +3,9 @@ import { ethers } from "ethers";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 require("dotenv").config();
 
-const provider = new ethers.providers.JsonRpcProvider(
-  `https://opt-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
-);
+// const provider = new ethers.providers.JsonRpcProvider(
+//   `https://opt-mainnet.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
+// );
 
 // const provider = new ethers.providers.JsonRpcProvider(
 //   `https://opt-kovan.g.alchemy.com/v2/${process.env.ALCHEMY_PROJECT_ID}`
@@ -19,6 +19,8 @@ const provider = new ethers.providers.JsonRpcProvider(
 //   `https://polygon-mainnet.infura.io/v3/${process.env.INFURA_PROJECT_ID}`
 // );
 
+const provider = new ethers.providers.JsonRpcProvider("http://127.0.0.1:8545/");
+
 export const wallet = new ethers.Wallet(
   process.env.PRIVATE_KEY as string,
   provider

package/src/utils/deadline.ts

@@ -0,0 +1,6 @@
+import { Pool } from "../entities";
+
+export const getDeadline = async (pool: Pool): Promise<number> => {
+  const timestamp = (await pool.signer.provider.getBlock("latest")).timestamp;
+  return timestamp + 60 * 20; //add 20 min
+};

package/dist/services/claim-balancer/claim.service.d.ts

@@ -1,17 +0,0 @@
-import { ethers, Wallet } from "ethers";
-import { MultiTokenPendingClaims, TokenClaimInfo } from "./types";
-import { Network } from "../../types";
-export declare class ClaimService {
-    network: Network;
-    signer: ethers.Wallet;
-    constructor(network: Network, signer: Wallet);
-    getMultiTokensPendingClaims(account: string): Promise<MultiTokenPendingClaims[]>;
-    getTokenPendingClaims(tokenClaimInfo: TokenClaimInfo, account: string): Promise<MultiTokenPendingClaims>;
-    multiTokenClaimRewards(account: string, multiTokenPendingClaims: MultiTokenPendingClaims[]): Promise<any>;
-    private computeClaimProofs;
-    private computeClaimProof;
-    private getTokenClaimsInfo;
-    private getSnapshot;
-    private getClaimStatus;
-    private getReports;
-}

package/dist/services/claim-balancer/claim.worker.d.ts

@@ -1,4 +0,0 @@
-import { ComputeClaimProofPayload } from "./types";
-export declare class ClaimWorker {
-    calcClaimProof(payload: ComputeClaimProofPayload): any;
-}

package/dist/services/claim-balancer/ipfs.service.d.ts

@@ -1,4 +0,0 @@
-export default class IpfsService {
-    get<T>(hash: string, protocol?: string): Promise<T>;
-}
-export declare const ipfsService: IpfsService;

package/dist/services/claim-balancer/types.d.ts

@@ -1,54 +0,0 @@
-export interface Claim {
-    id: string;
-    amount: string;
-}
-export declare type Snapshot = Record<number, string>;
-export declare type TokenClaimInfo = {
-    label: string;
-    distributor: string;
-    token: string;
-    decimals: number;
-    manifest: string;
-    weekStart: number;
-};
-export declare type MultiTokenPendingClaims = {
-    claims: Claim[];
-    reports: Report;
-    tokenClaimInfo: TokenClaimInfo;
-    availableToClaim: string;
-};
-export declare type ClaimStatus = boolean;
-export declare type Report = Record<string, any>;
-export declare type MultiTokenCurrentRewardsEstimateResponse = {
-    success: boolean;
-    result: {
-        current_timestamp: string;
-        "liquidity-providers": Array<{
-            snapshot_timestamp: string;
-            address: string;
-            token_address: string;
-            chain_id: number;
-            current_estimate: string;
-            velocity: string;
-            week: number;
-        }>;
-    };
-};
-export declare type MultiTokenCurrentRewardsEstimate = {
-    rewards: string;
-    velocity: string;
-    token: string;
-};
-export declare type ClaimProofTuple = [number, string, string, number, string[]];
-export declare type ComputeClaimProofPayload = {
-    report: Report;
-    account: string;
-    claim: Claim;
-    distributor: string;
-    tokenIndex: number;
-    decimals: number;
-};
-export declare type ClaimWorkerMessage<P = any> = {
-    type: "computeClaimProof";
-    payload: P;
-};

package/src/services/claim-balancer/MultiTokenClaim.json

@@ -1,115 +0,0 @@
-{
-    "1": [
-        {
-            "label": "BAL",
-            "distributor": "0xd2EB7Bd802A7CA68d9AcD209bEc4E664A9abDD7b",
-            "token": "0xba100000625a3754423978a60c9317c58a424e3d",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current.json",
-            "weekStart": 52
-        },
-        {
-            "label": "UNN",
-            "distributor": "0xBfbd6e720ffdF0497f69C95E5C03a4861C65A6E7",
-            "token": "0x226f7b842E0F0120b7E194D05432b3fd14773a9D",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-union.json",
-            "weekStart": 1
-        },
-        {
-            "label": "BANK",
-            "distributor": "0x9d20FE66eC5Dd15a3D3213556534C77cA20318bE",
-            "token": "0x2d94AA3e47d9D5024503Ca8491fcE9A2fB4DA198",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-bankless.json",
-            "weekStart": 1
-        },
-        {
-            "label": "NOTE",
-            "distributor": "0xF1C2dD9bD863f2444086B739383F1043E6b88F69",
-            "token": "0xcfeaead4947f0705a14ec42ac3d44129e1ef3ed5",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-note.json",
-            "weekStart": 1
-        },
-        {
-            "label": "NEXO",
-            "distributor": "0x0000000000000000000000000000000000000000",
-            "token": "0xB62132e35a6c13ee1EE0f84dC5d40bad8d815206",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-nexo.json",
-            "weekStart": 1
-        }
-    ],
-    "42": [
-      {
-          "label": "BAL",
-          "distributor": "0x95FaE1C936B4Cd6c5099d7A705D792ee6aC9FEc3",
-          "token": "0x41286Bb1D3E870f3F750eB7E1C25d7E48c8A1Ac7",
-          "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/sample-tree/reports-kovan/_current.json",
-          "weekStart": 52
-      },
-      {
-        "label": "DAI",
-        "distributor": "0x95FaE1C936B4Cd6c5099d7A705D792ee6aC9FEc3",
-        "token": "0x04DF6e4121c27713ED22341E7c7Df330F56f289B",
-        "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/sample-tree/reports-kovan/_current-dai.json",
-        "weekStart": 1
-    }
-    ],
-    "137": [
-        {
-            "label": "BAL",
-            "distributor": "0xd2EB7Bd802A7CA68d9AcD209bEc4E664A9abDD7b",
-            "token": "0x9a71012b13ca4d3d0cdc72a177df3ef03b0e76a3",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-polygon.json",
-            "weekStart": 1
-        },
-        {
-            "label": "WMATIC",
-            "distributor": "0x087A7AFB6975A2837453BE685EB6272576c0bC06",
-            "token": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-wmatic-polygon.json",
-            "weekStart": 1
-        },
-        {
-            "label": "WMATIC",
-            "distributor": "0xBd44C01EC7d623372B4572247afB6231eDD8486F",
-            "token": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-wmatic-polygon.json",
-            "weekStart": 4
-        },
-        {
-            "label": "WMATIC",
-            "distributor": "0x632208491602Dd205da8Cb9C0BA98620fc19854A",
-            "token": "0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-wmatic-polygon.json",
-            "weekStart": 5
-        },
-        {
-            "label": "TUSD",
-            "distributor": "0x09f3010ec0f6d72ef8ff2008f8e756d60482c9a8",
-            "token": "0x2e1ad108ff1d8c782fcbbb89aad783ac49586756",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-tusd-polygon.json",
-            "weekStart": 1
-        }
-      ],
-    "42161": [
-        {
-            "label": "BAL",
-            "distributor": "0xd2EB7Bd802A7CA68d9AcD209bEc4E664A9abDD7b",
-            "token": "0x040d1EdC9569d4Bab2D15287Dc5A4F10F56a56B8",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-arbitrum.json",
-            "weekStart": 6
-        },
-        {
-            "label": "MCB",
-            "distributor": "0x25c646adf184051b35a405b9aaeba321e8d5342a",
-            "token": "0x4e352cf164e64adcbad318c3a1e222e9eba4ce42",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-mcdex-arbitrum.json",
-            "weekStart": 4
-        },
-        {
-            "label": "PICKLE",
-            "distributor": "0xf02CeB58d549E4b403e8F85FBBaEe4c5dfA47c01",
-            "token": "0x965772e0e9c84b6f359c8597c891108dcf1c5b1a",
-            "manifest": "https://raw.githubusercontent.com/balancer-labs/bal-mining-scripts/master/reports/_current-pickle-arbitrum.json",
-            "weekStart": 4
-        }
-    ]
-  }