@dhedge/v2-sdk 1.10.9 → 1.10.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "1.10.9",
+  "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

@@ -31,7 +31,8 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.ARRAKIS]: "0xc73fb100a995b33f9fa181d420f4c8d74506df66",
     [Dapp.TOROS]: "0x45b90480D6F643dE2f128db091A357C3c90399f2",
-    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff"
+    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+    [Dapp.ODOS]: "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf"
   },
   [Network.OPTIMISM]: {
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
@@ -43,7 +44,8 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.VELODROMEV2]: "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858",
     [Dapp.LYRA]: "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B",
     [Dapp.ARRAKIS]: "0x9ce88a56d120300061593eF7AD074A1B710094d5",
-    [Dapp.ZEROEX]: "0xdef1abe32c034e558cdd535791643c58a13acc10"
+    [Dapp.ZEROEX]: "0xdef1abe32c034e558cdd535791643c58a13acc10",
+    [Dapp.ODOS]: "0xca423977156bb05b13a2ba3b76bc5419e2fe9680"
   },
   [Network.ARBITRUM]: {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
@@ -52,14 +54,16 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     [Dapp.RAMSES]: "0xaaa87963efeb6f7e0a2711f397663105acb1805e",
     [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-    [Dapp.TOROS]: "0xA5679C4272A056Bb83f039961fae7D99C48529F5"
+    [Dapp.TOROS]: "0xA5679C4272A056Bb83f039961fae7D99C48529F5",
+    [Dapp.ODOS]: "0xa669e7A0d4b3e4Fa48af2dE86BD4CD7126Be4e13"
   },
   [Network.BASE]: {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     [Dapp.AERODROME]: "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43",
     [Dapp.AAVEV3]: "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5",
-    [Dapp.TOROS]: "0xf067575Eb60c7587C11e867907AA7284833704d1"
+    [Dapp.TOROS]: "0xf067575Eb60c7587C11e867907AA7284833704d1",
+    [Dapp.ODOS]: "0x19cEeAd7105607Cd444F5ad10dd51356436095a1"
   }
 };
 
@@ -166,10 +170,11 @@ export const flatMoneyContractAddresses: Readonly<Partial<
   Record<
     Network,
     {
+      OrderExecution?: string;
       DelayedOrder: string;
       FlatcoinVault: string;
       StableModule: string;
-      RETH: string;
+      COLLATERAL: string;
     }
   >
 >> = {
@@ -177,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

@@ -86,6 +86,7 @@ import {
   getPancakeStakeTxData,
   getPancakeUnStakeTxData
 } from "../services/pancake/staking";
+import { getOdosSwapTxData } from "../services/odos";
 
 export class Pool {
   public readonly poolLogic: Contract;
@@ -95,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,
@@ -102,7 +104,8 @@ export class Pool {
     poolLogic: Contract,
     mangerLogic: Contract,
     utils: Utils,
-    factory: Contract
+    factory: Contract,
+    isDhedge = true
   ) {
     this.network = network;
     this.poolLogic = poolLogic;
@@ -111,6 +114,7 @@ export class Pool {
     this.signer = signer;
     this.utils = utils;
     this.factory = factory;
+    this.isDhedge = isDhedge;
   }
 
   /**
@@ -420,6 +424,15 @@ export class Pool {
           slippage
         );
         break;
+      case Dapp.ODOS:
+        swapTxData = await getOdosSwapTxData(
+          this,
+          assetFrom,
+          assetTo,
+          amountIn,
+          slippage
+        );
+        break;
       default:
         const iUniswapV2Router = new ethers.utils.Interface(
           IUniswapV2Router.abi

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/services/odos/index.ts

@@ -0,0 +1,61 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import axios from "axios";
+import { ApiError, ethers } from "../..";
+import { networkChainIdMap } from "../../config";
+import { Pool } from "../../entities";
+
+const odosBaseUrl = "https://api.odos.xyz/sor";
+
+export async function getOdosSwapTxData(
+  pool: Pool,
+  assetFrom: string,
+  assetTo: string,
+  amountIn: ethers.BigNumber | string,
+  slippage: number
+): Promise<string> {
+  let referralCode = 0; //  Defaults to 0 for unregistered activity.
+  if (
+    process.env.ODOS_REFERAL_CODE &&
+    Number(process.env.ODOS_REFERAL_CODE) > 0
+  ) {
+    referralCode = Number(process.env.ODOS_REFERAL_CODE);
+  }
+  const quoteParams = {
+    chainId: networkChainIdMap[pool.network],
+    inputTokens: [
+      {
+        tokenAddress: assetFrom,
+        amount: amountIn.toString()
+      }
+    ],
+    outputTokens: [
+      {
+        tokenAddress: assetTo,
+        proportion: 1
+      }
+    ],
+    slippageLimitPercent: slippage,
+    userAddr: pool.address,
+    referralCode
+  };
+  try {
+    const quoteResult = await axios.post(
+      `${odosBaseUrl}/quote/v2`,
+      quoteParams
+    );
+
+    const assembleParams = {
+      pathId: quoteResult.data.pathId,
+      userAddr: pool.address
+    };
+
+    const assembleResult = await axios.post(
+      `${odosBaseUrl}/assemble`,
+      assembleParams
+    );
+    return assembleResult.data.transaction.data;
+  } catch (e) {
+    console.error("Error in Odos API request:", e);
+    throw new ApiError("Swap api request of Odos failed");
+  }
+}

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/test/odos.test.ts

@@ -0,0 +1,109 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+import { Dhedge, Pool } from "..";
+
+import { Dapp, Network } from "../types";
+import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
+import {
+  TestingRunParams,
+  setUSDCAmount,
+  testingHelper,
+  wait
+} from "./utils/testingHelper";
+import { allowanceDelta, balanceDelta } from "./utils/token";
+import { getTxOptions } from "./txOptions";
+import BigNumber from "bignumber.js";
+import { routerAddress } from "../config";
+
+const testOdos = ({ wallet, network, provider }: TestingRunParams) => {
+  const USDC = CONTRACT_ADDRESS[network].USDC;
+  const WETH = CONTRACT_ADDRESS[network].WETH;
+
+  let dhedge: Dhedge;
+  let pool: Pool;
+  jest.setTimeout(100000);
+
+  describe(`pool on ${network}`, () => {
+    beforeAll(async () => {
+      dhedge = new Dhedge(wallet, network);
+      pool = await dhedge.loadPool(TEST_POOL[network]);
+      // top up gas
+      await provider.send("hardhat_setBalance", [
+        wallet.address,
+        "0x10000000000000000"
+      ]);
+      await provider.send("evm_mine", []);
+      // top up USDC
+      await setUSDCAmount({
+        amount: new BigNumber(2).times(1e6).toFixed(0),
+        userAddress: pool.address,
+        network,
+        provider
+      });
+    });
+
+    it("approves unlimited USDC on Odos", async () => {
+      await pool.approve(Dapp.ODOS, USDC, MAX_AMOUNT);
+      const usdcAllowanceDelta = await allowanceDelta(
+        pool.address,
+        USDC,
+        routerAddress[network]["odos"]!,
+        pool.signer
+      );
+      await expect(usdcAllowanceDelta.gt(0));
+    });
+
+    it("gets gas estimation for 2 USDC into WETH on Odos", async () => {
+      const gasEstimate = await pool.trade(
+        Dapp.ODOS,
+        USDC,
+        WETH,
+        "2000000",
+        1,
+        await getTxOptions(network),
+        true
+      );
+      expect(gasEstimate.gt(0));
+    });
+
+    it("trades 2 USDC into WETH on Odos", async () => {
+      await wait(1);
+      await pool.trade(
+        Dapp.ODOS,
+        USDC,
+        WETH,
+        "2000000",
+        0.5,
+        await getTxOptions(network)
+      );
+      const wethBalanceDelta = await balanceDelta(
+        pool.address,
+        WETH,
+        pool.signer
+      );
+      expect(wethBalanceDelta.gt(0));
+    });
+  });
+};
+
+// testingHelper({
+//   network: Network.OPTIMISM,
+//   testingRun: testOdos
+// });
+
+testingHelper({
+  network: Network.ARBITRUM,
+  testingRun: testOdos
+});
+
+// testingHelper({
+//   network: Network.POLYGON,
+//   onFork: false,
+//   testingRun: testOdos
+// });
+
+// testingHelper({
+//   network: Network.BASE,
+//   onFork: false,
+//   testingRun: testOdos
+// });