@dhedge/v2-sdk 2.0.2 → 2.1.0

package/src/test/pool.test.ts

@@ -1,13 +1,16 @@
 import { Dhedge, Pool } from "..";
 import { Network } from "../types";
-import { TEST_POOL } from "./constants";
+import { CONTRACT_ADDRESS, TEST_POOL } from "./constants";
 
 import { testingHelper, TestingRunParams } from "./utils/testingHelper";
+import { balanceDelta } from "./utils/token";
 
-const testPool = ({ wallet, network, provider }: TestingRunParams) => {
+const testPool = ({ wallet, network }: TestingRunParams) => {
   let dhedge: Dhedge;
   let pool: Pool;
 
+  const USDT = CONTRACT_ADDRESS[network].USDT;
+
   jest.setTimeout(200000);
 
   describe(`pool on ${network}`, () => {
@@ -15,62 +18,65 @@ const testPool = ({ wallet, network, provider }: TestingRunParams) => {
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
 
-      await provider.send("hardhat_setBalance", [
-        wallet.address,
-        "0x10000000000000000"
-      ]);
+      // await provider.send("hardhat_setBalance", [
+      //   wallet.address,
+      //   "0x10000000000000000"
+      // ]);
     });
 
     it("checks fund composition", async () => {
       const result = await pool.getComposition();
+      console.log(result);
       expect(result.length).toBeGreaterThan(0);
     });
 
-    it("sets pool private", async () => {
-      const result = await pool.setPrivate(true);
-      expect(result).not.toBeNull();
-    });
+    // it("sets pool private", async () => {
+    //   const result = await pool.setPrivate(true);
+    //   expect(result).not.toBeNull();
+    // });
 
-    //   it("approves USDC balance of User for Deposit", async () => {
-    //     await pool.approveDeposit(
-    //       CONTRACT_ADDRESS[network].USDC,
-    //       ethers.constants.MaxUint256
-    //     );
-    //     const UsdcAllowanceDelta = await allowanceDelta(
-    //       pool.signer.address,
-    //       CONTRACT_ADDRESS[network].USDC,
-    //       pool.address,
-    //       pool.signer
-    //     );
-    //     expect(UsdcAllowanceDelta.gt(0));
-    //   });
+    // it("adds WBTC to enabled assets", async () => {
+    //   const assetsBefore = await pool.getComposition();
 
-    //   it("deposits 1 USDC into Pool", async () => {
-    //     await pool.deposit(CONTRACT_ADDRESS[network].USDC, (1e6).toString());
-    //     const poolTokenDelta = await balanceDelta(
-    //       pool.signer.address,
-    //       pool.address,
-    //       pool.signer
-    //     );
-    //     expect(poolTokenDelta.gt(0));
-    //   });
-
-    //   it("adds WBTC to enabled assets", async () => {
-    //     const assetsBefore = await pool.getComposition();
-
-    //     const newAssets: AssetEnabled[] = [
-    //       { asset: CONTRACT_ADDRESS[network].USDC, isDeposit: true },
-    //       { asset: CONTRACT_ADDRESS[network].WETH, isDeposit: false },
-    //       { asset: CONTRACT_ADDRESS[network].WBTC, isDeposit: false }
-    //     ];
-    //     await pool.changeAssets(newAssets);
-    //     const assetsAfter = await pool.getComposition();
-    //     if (assetsBefore.length < newAssets.length) {
-    //       expect(assetsAfter.length).toBeGreaterThan(assetsBefore.length);
-    //     } else {
-    //       expect(assetsAfter.length).toBeLessThanOrEqual(assetsBefore.length);
+    //   const newAssets: AssetEnabled[] = [
+    //     { asset: CONTRACT_ADDRESS[network].USDT, isDeposit: true },
+    //     { asset: CONTRACT_ADDRESS[network].USDE, isDeposit: true },
+    //     {
+    //       asset: "0x925a2A7214Ed92428B5b1B090F80b25700095e12",
+    //       isDeposit: false
     //     }
-    //   });
+    //   ];
+    //   await pool.changeAssets(newAssets);
+    //   const assetsAfter = await pool.getComposition();
+    //   expect(assetsAfter.length).toBeLessThanOrEqual(assetsBefore.length);
+    // });
+
+    // it("approves USDT balance of User for Deposit", async () => {
+    //   await pool.approveDeposit(
+    //     CONTRACT_ADDRESS[network].USDT,
+    //     ethers.constants.MaxUint256
+    //   );
+    //   const usdtAllowanceDelta = await allowanceDelta(
+    //     pool.signer.address,
+    //     CONTRACT_ADDRESS[network].USDC,
+    //     pool.address,
+    //     pool.signer
+    //   );
+    //   expect(usdtAllowanceDelta.gt(0));
+    // });
+
+    it("deposits 200 USDT into Pool", async () => {
+      await pool.deposit(
+        CONTRACT_ADDRESS[network].USDT,
+        (200000000).toString()
+      );
+      const poolTokenDelta = await balanceDelta(
+        pool.address,
+        USDT,
+        pool.signer
+      );
+      expect(poolTokenDelta.gt(0));
+    });
 
     //   it("get available Manager Fee", async () => {
     //     const result = await pool.getAvailableManagerFee();
@@ -102,6 +108,7 @@ const testPool = ({ wallet, network, provider }: TestingRunParams) => {
 // });
 
 testingHelper({
-  network: Network.OPTIMISM,
+  network: Network.PLASMA,
+  onFork: false,
   testingRun: testPool
 });

package/src/test/wallet.ts

@@ -8,7 +8,8 @@ export const networkPortMap = {
   [Network.OPTIMISM]: 8544,
   [Network.ARBITRUM]: 8540,
   [Network.BASE]: 8546,
-  [Network.ETHEREUM]: 8547
+  [Network.ETHEREUM]: 8547,
+  [Network.PLASMA]: 8548
 };
 
 export const getWalletData = (

package/src/types.ts

@@ -6,7 +6,8 @@ export enum Network {
   OPTIMISM = "optimism",
   ARBITRUM = "arbitrum",
   BASE = "base",
-  ETHEREUM = "ethereum"
+  ETHEREUM = "ethereum",
+  PLASMA = "plasma"
 }
 
 export enum Dapp {
@@ -31,7 +32,8 @@ export enum Dapp {
   PANCAKECL = "pancakeCL",
   COMPOUNDV3 = "compoundV3",
   ODOS = "odos",
-  PENDLE = "pendle"
+  PENDLE = "pendle",
+  KYBERSWAP = "kyberswap"
 }
 
 export enum Transaction {

package/src/utils/contract.ts

@@ -4,6 +4,7 @@ import set from "lodash/set";
 import { Interface } from "@ethersproject/abi";
 import { multiCallAddress } from "../config";
 import { ethers, Network, Pool, SDKOptions } from "..";
+import { Signer } from "ethers";
 
 export async function call(
   provider: ethers.Signer,
@@ -95,14 +96,29 @@ export class Multicaller {
 }
 
 const getGasEstimateData = async (
+  pool: Pool,
   estimateFunc: ethers.ContractFunction<ethers.BigNumber>,
   txInfoData: { to: string; txData: string; minAmountOut: any },
-  txOptions: any = {}
+  txOptions: any = {},
+  sdkOptions: SDKOptions
 ) => {
   let gas = null;
   let gasEstimationError = null;
   try {
-    gas = await estimateFunc(txInfoData.to, txInfoData.txData, txOptions);
+    if (
+      !pool.isDhedge ||
+      (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.useTraderAddressAsFrom)
+    ) {
+      // for pool.signer.estimateGas
+      gas = await (estimateFunc as Signer["estimateGas"])({
+        to: txInfoData.to,
+        data: txInfoData.txData,
+        ...txOptions
+      });
+    } else {
+      // for pool.poolLogic.estimateGas.execTransaction
+      gas = await estimateFunc(txInfoData.to, txInfoData.txData, txOptions);
+    }
   } catch (e) {
     gasEstimationError = e;
   }
@@ -145,9 +161,11 @@ export const getPoolTxOrGasEstimate = async (
       (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.estimateGas)
     ) {
       return await getGasEstimateData(
-        pool.signer.estimateGas,
+        pool,
+        pool.signer.estimateGas.bind(pool.signer),
         txInfoData,
-        txOptions
+        txOptions,
+        sdkOptions
       );
     } else {
       return await pool.signer.sendTransaction({
@@ -162,9 +180,11 @@ export const getPoolTxOrGasEstimate = async (
       (!isSdkOptionsBoolean(sdkOptions) && sdkOptions.estimateGas)
     ) {
       return await getGasEstimateData(
+        pool,
         pool.poolLogic.estimateGas.execTransaction,
         txInfoData,
-        txOptions
+        txOptions,
+        sdkOptions
       );
     } else {
       return await pool.poolLogic.execTransaction(