@dhedge/v2-sdk 1.10.10 → 1.10.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.10.10",
+  "version": "1.10.11",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
     "@size-limit/preset-small-lib": "^5.0.1",
     "@types/jest": "^28.1.7",
     "@types/lodash": "^4.14.178",
-    "hardhat": "2.22.18",
+    "hardhat": "2.23.0",
     "husky": "^7.0.1",
     "jest": "^28.1.3",
     "size-limit": "^5.0.1",

package/src/abi/flatmoney/v2/IOrderExecutionModule.json

@@ -0,0 +1,96 @@
+[
+    {
+        "type": "function",
+        "name": "cancelExistingOrder",
+        "inputs": [
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            }
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "cancelOrderByModule",
+        "inputs": [
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            }
+        ],
+        "outputs": [],
+        "stateMutability": "nonpayable"
+    },
+    {
+        "type": "function",
+        "name": "executeLimitOrder",
+        "inputs": [
+            {
+                "name": "tokenId",
+                "type": "uint256",
+                "internalType": "uint256"
+            },
+            {
+                "name": "priceUpdateData",
+                "type": "bytes[]",
+                "internalType": "bytes[]"
+            }
+        ],
+        "outputs": [],
+        "stateMutability": "payable"
+    },
+    {
+        "type": "function",
+        "name": "executeOrder",
+        "inputs": [
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            },
+            {
+                "name": "priceUpdateData",
+                "type": "bytes[]",
+                "internalType": "bytes[]"
+            }
+        ],
+        "outputs": [],
+        "stateMutability": "payable"
+    },
+    {
+        "type": "function",
+        "name": "hasOrderExpired",
+        "inputs": [
+            {
+                "name": "account",
+                "type": "address",
+                "internalType": "address"
+            }
+        ],
+        "outputs": [
+            {
+                "name": "expired",
+                "type": "bool",
+                "internalType": "bool"
+            }
+        ],
+        "stateMutability": "view"
+    },
+    {
+        "type": "function",
+        "name": "maxExecutabilityAge",
+        "inputs": [],
+        "outputs": [
+            {
+                "name": "maxExecutabilityAge",
+                "type": "uint64",
+                "internalType": "uint64"
+            }
+        ],
+        "stateMutability": "view"
+    }
+]

package/src/config.ts

@@ -170,10 +170,11 @@ export const flatMoneyContractAddresses: Readonly<Partial<
   Record<
     Network,
     {
+      OrderExecution?: string;
       DelayedOrder: string;
       FlatcoinVault: string;
       StableModule: string;
-      RETH: string;
+      COLLATERAL: string;
     }
   >
 >> = {
@@ -181,6 +182,13 @@ export const flatMoneyContractAddresses: Readonly<Partial<
     DelayedOrder: "0x6D857e9D24a7566bB72a3FB0847A3E0e4E1c2879",
     FlatcoinVault: "0x95Fa1ddc9a78273f795e67AbE8f1Cd2Cd39831fF",
     StableModule: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
-    RETH: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c"
+    COLLATERAL: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c" // RETH
+  },
+  [Network.OPTIMISM]: {
+    OrderExecution: "0x7805CB7fb2C2e70FDdF92949065D9Ee1Fc2F72a8",
+    DelayedOrder: "0xd917A0C9B21Bb71DF1209d2c211Ad83004F01554", // OrderAnnouncementModule
+    FlatcoinVault: "0x86C7b9640302082B0dF78023F930d8612bFcaD3f",
+    COLLATERAL: "0x68f180fcCe6836688e9084f035309E29Bf0A2095", // WBTC
+    StableModule: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5"
   }
 };

package/src/entities/dhedge.ts

@@ -23,7 +23,6 @@ export class Dhedge {
       PoolFactory.abi,
       this.signer
     );
-
     this.utils = new Utils(this.network, this.signer);
   }
 
@@ -87,9 +86,10 @@ export class Dhedge {
    * @param {string} address Pool address
    * @returns {Pool} Loaded Pool
    */
-  public async loadPool(address: string): Promise<Pool> {
+  public async loadPool(address: string, isDhedge = true): Promise<Pool> {
     const poolLogic = new Contract(address, PoolLogic.abi, this.signer);
-    const managerLogicAddress = await poolLogic.poolManagerLogic();
+    let managerLogicAddress = address;
+    if (isDhedge) managerLogicAddress = await poolLogic.poolManagerLogic();
     const managerLogic = new Contract(
       managerLogicAddress,
       ManagerLogic.abi,
@@ -102,7 +102,8 @@ export class Dhedge {
       poolLogic,
       managerLogic,
       this.utils,
-      this.factory
+      this.factory,
+      isDhedge
     );
   }
 

package/src/entities/pool.ts

@@ -96,6 +96,7 @@ export class Pool {
   public readonly address: string;
   public readonly utils: Utils;
   public readonly network: Network;
+  public readonly isDhedge: boolean;
 
   public constructor(
     network: Network,
@@ -103,7 +104,8 @@ export class Pool {
     poolLogic: Contract,
     mangerLogic: Contract,
     utils: Utils,
-    factory: Contract
+    factory: Contract,
+    isDhedge = true
   ) {
     this.network = network;
     this.poolLogic = poolLogic;
@@ -112,6 +114,7 @@ export class Pool {
     this.signer = signer;
     this.utils = utils;
     this.factory = factory;
+    this.isDhedge = isDhedge;
   }
 
   /**

package/src/services/flatmoney/keeperFee.ts

@@ -4,6 +4,7 @@ import IFlatcoinVaultAbi from "../../abi/flatmoney/IFlatcoinVault.json";
 import KeeperFeeAbi from "../../abi/flatmoney/KeeperFee.json";
 import { flatMoneyContractAddresses } from "../../config";
 import BigNumber from "bignumber.js";
+import { JsonRpcProvider } from "@ethersproject/providers";
 
 export const getKeeperFeeContract = async (pool: Pool): Promise<Contract> => {
   const flatMoneyContracts = flatMoneyContractAddresses[pool.network];
@@ -35,12 +36,16 @@ export const getKeeperFee = async (
   maxKeeperFeeInUsd: number | null
 ): Promise<ethers.BigNumber> => {
   const keeperFeeContract = await getKeeperFeeContract(pool);
-  const gasPrice = await pool.signer.provider.getGasPrice();
+
+  const feeHistory = await (pool.signer
+    .provider as JsonRpcProvider).send("eth_feeHistory", [1, "latest"]);
+
+  const gasPrice = Number(feeHistory.baseFeePerGas[0]);
 
   let keeperfee: ethers.BigNumber;
   if (gasPrice) {
     keeperfee = await keeperFeeContract["getKeeperFee(uint256)"](
-      new BigNumber(gasPrice.toString()).times(1.2).toFixed(0)
+      new BigNumber(gasPrice.toString()).times(1.5).toFixed(0)
     );
   } else {
     keeperfee = await keeperFeeContract["getKeeperFee()"]();
@@ -72,7 +77,7 @@ export const getKeeperFeeInUsd = async (
   const filteredFc = fundComposition.filter(
     fc =>
       fc.asset.toLocaleLowerCase() ===
-      flatMoneyContracts.RETH.toLocaleLowerCase()
+      flatMoneyContracts.COLLATERAL.toLocaleLowerCase()
   );
 
   if (!filteredFc[0])
@@ -80,5 +85,8 @@ export const getKeeperFeeInUsd = async (
 
   const rateD1 = new BigNumber(filteredFc[0].rate.toString()).div(1e18);
 
-  return rateD1.times(keeperFee.toString()).div(1e18);
+  const assetDecimal = await pool.utils.getDecimals(
+    flatMoneyContracts.COLLATERAL
+  );
+  return rateD1.times(keeperFee.toString()).div(10 ** assetDecimal);
 };

package/src/services/flatmoney/stableLp.ts

@@ -3,6 +3,7 @@
 import BigNumber from "bignumber.js";
 import { Pool, ethers } from "../..";
 import DelayedOrderAbi from "../../abi/flatmoney/DelayedOrder.json";
+import IOrderExecutionModuleAbi from "../../abi/flatmoney/v2/IOrderExecutionModule.json";
 import { flatMoneyContractAddresses } from "../../config";
 import { getPoolTxOrGasEstimate } from "../../utils/contract";
 import { getStableDepositQuote, getStableWithdrawQuote } from "./stableModule";
@@ -42,6 +43,12 @@ export function getCancelExistingOrderTxData(account: string): string {
   ).encodeFunctionData("cancelExistingOrder", [account]);
 }
 
+export function getCancelExistingOrderTxDataForV2(account: string): string {
+  return new ethers.utils.Interface(
+    IOrderExecutionModuleAbi
+  ).encodeFunctionData("cancelExistingOrder", [account]);
+}
+
 export async function mintUnitViaFlatMoney(
   pool: Pool,
   depositAmount: ethers.BigNumber | string,
@@ -55,7 +62,7 @@ export async function mintUnitViaFlatMoney(
     throw new Error("mintUnitViaFlatMoney: network not supported");
   }
 
-  const keeperfee = await getKeeperFee(pool, maxKeeperFeeInUsd); // in RETH
+  const keeperfee = await getKeeperFee(pool, maxKeeperFeeInUsd); // in COLLATERAL
 
   const adjustedDepositAmount = new BigNumber(depositAmount.toString()).minus(
     keeperfee.toString() // keeper fee deducted from amountIn
@@ -125,11 +132,26 @@ export async function cancelOrderViaFlatMoney(
   if (!flatMoneyContracts) {
     throw new Error("cancelOrderViaFlatMoney: network not supported");
   }
-  const cancelOrderTxData = await getCancelExistingOrderTxData(pool.address);
-  const tx = await getPoolTxOrGasEstimate(
-    pool,
-    [flatMoneyContracts.DelayedOrder, cancelOrderTxData, options],
-    estimateGas
-  );
-  return tx;
+  // flat money v2
+  // use OrderExecution module to cancel order
+  let toAddress = flatMoneyContracts.DelayedOrder;
+  let cancelOrderTxData = getCancelExistingOrderTxData(pool.address);
+  if (flatMoneyContracts.OrderExecution) {
+    toAddress = flatMoneyContracts.OrderExecution;
+    cancelOrderTxData = await getCancelExistingOrderTxDataForV2(pool.address);
+  }
+  // use trader address to cancel order
+  if (estimateGas) {
+    return pool.signer.estimateGas({
+      to: toAddress,
+      data: cancelOrderTxData
+    });
+  } else {
+    const tx = await pool.signer.sendTransaction({
+      to: toAddress,
+      data: cancelOrderTxData,
+      ...options
+    });
+    return tx;
+  }
 }

package/src/test/constants.ts

@@ -62,7 +62,8 @@ export const CONTRACT_ADDRESS = {
     VELODROME_CL_USDC_WETH_GAUGE: "",
     VELO: "",
     COMPOUNDV3_WETH: "",
-    TOROS: ""
+    TOROS: "",
+    UNIT: ""
   },
 
   [Network.OPTIMISM]: {
@@ -77,6 +78,7 @@ export const CONTRACT_ADDRESS = {
       nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
     },
 
+    UNIT: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5",
     WMATIC: "",
     //
     ARRAKIS_USDC_WETH_GAUGE: "",
@@ -101,6 +103,8 @@ export const CONTRACT_ADDRESS = {
       nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
     },
 
+    UNIT: "",
+
     //
     ARRAKIS_USDC_WETH_GAUGE: "",
     ARRAKIS_USDC_WETH_LP: "",
@@ -117,6 +121,7 @@ export const CONTRACT_ADDRESS = {
     WETH: "0x4200000000000000000000000000000000000006",
     WBTC: "",
     SWETH: "",
+    UNIT: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
     uniswapV3: {
       nonfungiblePositionManager: ""
     },

package/src/test/flatmoney.test.ts

@@ -4,6 +4,7 @@ import { Dhedge, Pool } from "../entities";
 import { AssetEnabled, Network } from "../types";
 import {
   TestingRunParams,
+  runWithImpersonateAccount,
   setTokenAmount,
   testingHelper
 } from "./utils/testingHelper";
@@ -14,9 +15,7 @@ import DelayedOrderAbi from "../abi/flatmoney/DelayedOrder.json";
 import { allowanceDelta } from "./utils/token";
 import { getKeeperFee } from "../services/flatmoney/keeperFee";
 
-const RETH = "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c";
-const RETH_SLOT = 0;
-const UNIT = "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2";
+const COLLATERAL_SLOT = 0; // same for RETH(base) and WBTC(optimism)
 // https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/master/contracts/token/ERC20/ERC20Upgradeable.sol#L31
 // https://eips.ethereum.org/EIPS/eip-7201
 const UNIT_SLOT =
@@ -31,16 +30,26 @@ const testFlatMoney = ({
   let dhedge: Dhedge;
   let pool: Pool;
   let delayOrderContract: Contract;
+  let COLLATERAL: string;
   jest.setTimeout(200000);
   describe(`flatmoney on ${network}`, () => {
     beforeAll(async () => {
+      await provider.send("evm_mine", []);
       dhedge = new Dhedge(wallet, network);
       pool = await dhedge.loadPool(TEST_POOL[network]);
 
+      await runWithImpersonateAccount(
+        { provider, account: await pool.managerLogic.manager() },
+        async ({ signer }) => {
+          await pool.managerLogic.connect(signer).setTrader(wallet.address);
+        }
+      );
+
       const flatMoneyContracts = flatMoneyContractAddresses[pool.network];
       if (!flatMoneyContracts) {
         throw new Error("testFlatMoney: network not supported");
       }
+      COLLATERAL = flatMoneyContracts.COLLATERAL;
       delayOrderContract = new Contract(
         flatMoneyContracts.DelayedOrder,
         DelayedOrderAbi,
@@ -57,14 +66,14 @@ const testFlatMoney = ({
       await setTokenAmount({
         amount: new BigNumber(100).times(1e18).toString(),
         provider,
-        tokenAddress: RETH,
-        slot: RETH_SLOT,
+        tokenAddress: COLLATERAL,
+        slot: COLLATERAL_SLOT,
         userAddress: pool.address
       });
       await setTokenAmount({
         amount: new BigNumber(100).times(1e18).toString(),
         provider,
-        tokenAddress: UNIT,
+        tokenAddress: CONTRACT_ADDRESS[network].UNIT,
         slot: UNIT_SLOT,
         userAddress: pool.address
       });
@@ -82,11 +91,11 @@ const testFlatMoney = ({
         { asset: CONTRACT_ADDRESS[network].USDC, isDeposit: true },
         { asset: CONTRACT_ADDRESS[network].WETH, isDeposit: true },
         {
-          asset: UNIT,
+          asset: CONTRACT_ADDRESS[network].UNIT,
           isDeposit: false
         },
         {
-          asset: RETH,
+          asset: COLLATERAL,
           isDeposit: false
         }
       ];
@@ -95,10 +104,14 @@ const testFlatMoney = ({
 
     it("mint UNIT", async () => {
       //approve
-      await pool.approveSpender(delayOrderContract.address, RETH, MAX_AMOUNT);
+      await pool.approveSpender(
+        delayOrderContract.address,
+        COLLATERAL,
+        MAX_AMOUNT
+      );
       const collateralAllowanceDelta = await allowanceDelta(
         pool.address,
-        RETH,
+        COLLATERAL,
         delayOrderContract.address,
         pool.signer
       );
@@ -129,7 +142,13 @@ const testFlatMoney = ({
     });
 
     it("redeem UNIT", async () => {
-      const withdrawAmountStr = new BigNumber(2).times(1e18).toString();
+      let withdrawAmountStr;
+      if (Network.OPTIMISM === network) {
+        withdrawAmountStr = new BigNumber(2).times(1e8).toString(); // smaller amount
+      } else {
+        withdrawAmountStr = new BigNumber(2).times(1e18).toString();
+      }
+
       const tx = await pool.redeemUnitViaFlatMoney(
         withdrawAmountStr,
         0.5,

package/src/utils/contract.ts

@@ -99,13 +99,25 @@ export const getPoolTxOrGasEstimate = async (
   args: any[],
   estimateGas: boolean
 ): Promise<any> => {
-  if (estimateGas) {
-    return await pool.poolLogic.estimateGas.execTransaction(
-      args[0],
-      args[1],
-      args[2]
-    );
+  if (pool.isDhedge) {
+    if (estimateGas) {
+      return await pool.poolLogic.estimateGas.execTransaction(
+        args[0],
+        args[1],
+        args[2]
+      );
+    } else {
+      return await pool.poolLogic.execTransaction(args[0], args[1], args[2]);
+    }
   } else {
-    return await pool.poolLogic.execTransaction(args[0], args[1], args[2]);
+    if (estimateGas) {
+      return await pool.signer.estimateGas({ to: args[0], data: args[1] });
+    } else {
+      return await pool.signer.sendTransaction({
+        to: args[0],
+        data: args[1],
+        ...args[2]
+      });
+    }
   }
 };