@dhedge/v2-sdk 1.10.11 → 1.10.13

package/src/config.ts

@@ -17,7 +17,8 @@ export const factoryAddress: AddressNetworkMap = {
     : "0xfdc7b8bFe0DD3513Cc669bB8d601Cb83e2F69cB0",
   [Network.OPTIMISM]: "0x5e61a079A178f0E5784107a4963baAe0c5a680c6",
   [Network.ARBITRUM]: "0xfffb5fb14606eb3a548c113026355020ddf27535",
-  [Network.BASE]: "0x49Afe3abCf66CF09Fab86cb1139D8811C8afe56F"
+  [Network.BASE]: "0x49Afe3abCf66CF09Fab86cb1139D8811C8afe56F",
+  [Network.SONIC]: ""
 };
 
 export const routerAddress: AddressDappNetworkMap = {
@@ -31,7 +32,6 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.UNISWAPV3]: "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
     [Dapp.ARRAKIS]: "0xc73fb100a995b33f9fa181d420f4c8d74506df66",
     [Dapp.TOROS]: "0x45b90480D6F643dE2f128db091A357C3c90399f2",
-    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     [Dapp.ODOS]: "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf"
   },
   [Network.OPTIMISM]: {
@@ -44,7 +44,6 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.VELODROMEV2]: "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858",
     [Dapp.LYRA]: "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B",
     [Dapp.ARRAKIS]: "0x9ce88a56d120300061593eF7AD074A1B710094d5",
-    [Dapp.ZEROEX]: "0xdef1abe32c034e558cdd535791643c58a13acc10",
     [Dapp.ODOS]: "0xca423977156bb05b13a2ba3b76bc5419e2fe9680"
   },
   [Network.ARBITRUM]: {
@@ -53,17 +52,19 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.AAVEV3]: "0x794a61358D6845594F94dc1DB02A252b5b4814aD",
     [Dapp.BALANCER]: "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
     [Dapp.RAMSES]: "0xaaa87963efeb6f7e0a2711f397663105acb1805e",
-    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     [Dapp.TOROS]: "0xA5679C4272A056Bb83f039961fae7D99C48529F5",
     [Dapp.ODOS]: "0xa669e7A0d4b3e4Fa48af2dE86BD4CD7126Be4e13"
   },
   [Network.BASE]: {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
-    [Dapp.ZEROEX]: "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
     [Dapp.AERODROME]: "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43",
     [Dapp.AAVEV3]: "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5",
     [Dapp.TOROS]: "0xf067575Eb60c7587C11e867907AA7284833704d1",
     [Dapp.ODOS]: "0x19cEeAd7105607Cd444F5ad10dd51356436095a1"
+  },
+  [Network.SONIC]: {
+    [Dapp.AAVEV3]: "0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3",
+    [Dapp.ODOS]: "0xaC041Df48dF9791B0654f1Dbbf2CC8450C5f2e9D"
   }
 };
 
@@ -74,7 +75,8 @@ export const dappFactoryAddress: AddressDappNetworkMap = {
   },
   [Network.OPTIMISM]: {},
   [Network.ARBITRUM]: {},
-  [Network.BASE]: {}
+  [Network.BASE]: {},
+  [Network.SONIC]: {}
 };
 
 export const stakingAddress: AddressDappNetworkMap = {
@@ -94,7 +96,8 @@ export const stakingAddress: AddressDappNetworkMap = {
   },
   [Network.BASE]: {
     [Dapp.PANCAKECL]: "0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3"
-  }
+  },
+  [Network.SONIC]: {}
 };
 
 export const aaveAddressProvider: AddressDappNetworkMap = {
@@ -111,6 +114,9 @@ export const aaveAddressProvider: AddressDappNetworkMap = {
   [Network.BASE]: {
     // https://docs.aave.com/developers/deployed-contracts/v3-mainnet/base
     [Dapp.AAVEV3]: "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D"
+  },
+  [Network.SONIC]: {
+    [Dapp.AAVEV3]: "0x5C2e738F6E27bCE0F7558051Bf90605dD6176900"
   }
 };
 export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
@@ -130,6 +136,9 @@ export const nonfungiblePositionManagerAddress: AddressDappNetworkMap = {
     [Dapp.UNISWAPV3]: "0x03a520b32C04BF3bEEf7BEb72E919cf822Ed34f1",
     [Dapp.AERODROMECL]: "0x827922686190790b37229fd06084350e74485b72",
     [Dapp.PANCAKECL]: "0x46A15B0b27311cedF172AB29E4f4766fbE7F4364"
+  },
+  [Network.SONIC]: {
+    [Dapp.SHADOWCL]: "0x12e66c8f215ddd5d48d150c8f46ad0c6fb0f4406"
   }
 };
 
@@ -137,7 +146,8 @@ export const networkChainIdMap: NetworkChainIdMap = {
   [Network.POLYGON]: 137,
   [Network.OPTIMISM]: 10,
   [Network.ARBITRUM]: 42161,
-  [Network.BASE]: 8453
+  [Network.BASE]: 8453,
+  [Network.SONIC]: 146
 };
 
 export const balancerSubgraph: AddressNetworkMap = {
@@ -145,14 +155,16 @@ export const balancerSubgraph: AddressNetworkMap = {
     "https://api.thegraph.com/subgraphs/name/balancer-labs/balancer-polygon-v2",
   [Network.OPTIMISM]: "",
   [Network.ARBITRUM]: "",
-  [Network.BASE]: ""
+  [Network.BASE]: "",
+  [Network.SONIC]: ""
 };
 
 export const multiCallAddress: AddressNetworkMap = {
   [Network.POLYGON]: "0x275617327c958bD06b5D6b871E7f491D76113dd8",
   [Network.OPTIMISM]: "",
   [Network.ARBITRUM]: "",
-  [Network.BASE]: ""
+  [Network.BASE]: "",
+  [Network.SONIC]: ""
 };
 
 export const lyraNetworkMap: LyraNetworkMap = {

package/src/entities/pool.ts

@@ -63,7 +63,6 @@ import {
   getFuturesChangeMarginTxData
 } from "../services/futures";
 import { getFuturesCancelOrderTxData } from "../services/futures/trade";
-import { getZeroExTradeTxData } from "../services/zeroEx/zeroExTrade";
 import { getOneInchSwapTxData } from "../services/oneInch";
 import {
   getCreateVestTxData,
@@ -373,16 +372,6 @@ export class Pool {
   ): Promise<any> {
     let swapTxData: string;
     switch (dapp) {
-      case Dapp.ZEROEX:
-        swapTxData = await getZeroExTradeTxData(
-          this.network,
-          assetFrom,
-          assetTo,
-          amountIn,
-          slippage,
-          this.address
-        );
-        break;
       case Dapp.ONEINCH:
         ({ swapTxData } = await getOneInchSwapTxData(
           this,
@@ -1121,7 +1110,8 @@ export class Pool {
       | Dapp.VELODROMECL
       | Dapp.AERODROMECL
       | Dapp.RAMSESCL
-      | Dapp.PANCAKECL,
+      | Dapp.PANCAKECL
+      | Dapp.SHADOWCL,
     assetA: string,
     assetB: string,
     amountA: BigNumber | string,
@@ -1190,6 +1180,7 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
+      case Dapp.SHADOWCL:
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
@@ -1255,6 +1246,7 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
+      case Dapp.SHADOWCL:
         dappAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         break;
       case Dapp.VELODROMECL:
@@ -1319,6 +1311,7 @@ export class Pool {
     switch (dapp) {
       case Dapp.UNISWAPV3:
       case Dapp.RAMSESCL:
+      case Dapp.SHADOWCL:
         contractAddress = nonfungiblePositionManagerAddress[this.network][dapp];
         txData = iNonfungiblePositionManager.encodeFunctionData(
           Transaction.COLLECT,

package/src/services/uniswap/V3Liquidity.ts

@@ -19,6 +19,7 @@ import {
 } from "../../config";
 import INonfungiblePositionManager from "../../abi/INonfungiblePositionManager.json";
 import IVeldodromePositionManager from "../../abi/IVelodromeNonfungiblePositionManager.json";
+import IShadowNonfungiblePositionManager from "../../abi/IShadowNonfungiblePositionManager.json";
 import IRamsesPositionManager from "../../abi/IRamsesNonfungiblePositionManager.json";
 import IArrakisV1RouterStaking from "../../abi/IArrakisV1RouterStaking.json";
 import IPancakeMasterChef from "../../abi/IPancakeMasterChefV3.json";
@@ -77,7 +78,8 @@ export async function getUniswapV3MintTxData(
     | Dapp.VELODROMECL
     | Dapp.AERODROMECL
     | Dapp.RAMSESCL
-    | Dapp.PANCAKECL,
+    | Dapp.PANCAKECL
+    | Dapp.SHADOWCL,
   pool: Pool,
   assetA: string,
   assetB: string,
@@ -168,6 +170,12 @@ export async function getUniswapV3MintTxData(
     mintParams.push(0);
   }
 
+  if (dapp === Dapp.SHADOWCL) {
+    iNonfungiblePositionManager = new ethers.utils.Interface(
+      IShadowNonfungiblePositionManager
+    );
+  }
+
   return iNonfungiblePositionManager.encodeFunctionData(Transaction.MINT, [
     mintParams
   ]);
@@ -188,7 +196,9 @@ export async function getUniswapV3Liquidity(
   const iNonfungiblePositionManager = new ethers.Contract(
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     nonfungiblePositionManagerAddress[pool.network][dapp]!,
-    INonfungiblePositionManager.abi,
+    dapp === Dapp.SHADOWCL
+      ? IShadowNonfungiblePositionManager
+      : INonfungiblePositionManager.abi,
     pool.signer
   );
   const result = await iNonfungiblePositionManager.positions(tokenId);
@@ -208,7 +218,8 @@ export async function getIncreaseLiquidityTxData(
     dapp === Dapp.VELODROMECL ||
     dapp === Dapp.AERODROMECL ||
     dapp === Dapp.RAMSESCL ||
-    dapp === Dapp.PANCAKECL
+    dapp === Dapp.PANCAKECL ||
+    dapp === Dapp.SHADOWCL
   ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     txData = abi.encodeFunctionData(Transaction.INCREASE_LIQUIDITY, [
@@ -245,7 +256,8 @@ export async function getDecreaseLiquidityTxData(
     dapp === Dapp.VELODROMECL ||
     dapp === Dapp.AERODROMECL ||
     dapp === Dapp.RAMSESCL ||
-    dapp === Dapp.PANCAKECL
+    dapp === Dapp.PANCAKECL ||
+    dapp === Dapp.SHADOWCL
   ) {
     const abi = new ethers.utils.Interface(INonfungiblePositionManager.abi);
     const liquidity = (await getUniswapV3Liquidity(dapp, tokenId, pool))

package/src/test/constants.ts

@@ -133,6 +133,25 @@ export const CONTRACT_ADDRESS = {
     VELO: "0x940181a94A35A4569E4529A3CDfB74e38FD98631",
     COMPOUNDV3_WETH: "",
     TOROS: ""
+  },
+  [Network.SONIC]: {
+    USDC: "0x29219dd400f2bf60e5a23d13be72b486d4038894",
+    USDT: "",
+    SUSD: "",
+    WETH: "0x50c42deacd8fc9773493ed674b675be577f2634b",
+    WBTC: "",
+    SWETH: "",
+    uniswapV3: {
+      nonfungiblePositionManager: ""
+    },
+    //
+    ARRAKIS_USDC_WETH_GAUGE: "",
+    ARRAKIS_USDC_WETH_LP: "",
+    WMATIC: "",
+    VELODROME_CL_USDC_WETH_GAUGE: "",
+    VELO: "",
+    COMPOUNDV3_WETH: "",
+    TOROS: ""
   }
 };
 
@@ -142,12 +161,14 @@ export const USDC_BALANCEOF_SLOT = {
   [Network.OPTIMISM]: 9,
   [Network.ARBITRUM]: 9,
   [Network.POLYGON]: 0,
-  [Network.BASE]: 9
+  [Network.BASE]: 9,
+  [Network.SONIC]: 9
 };
 
 export const WETH_BALANCEOF_SLOT = {
   [Network.OPTIMISM]: 3,
   [Network.ARBITRUM]: 51,
   [Network.POLYGON]: 0,
-  [Network.BASE]: 0
+  [Network.BASE]: 0,
+  [Network.SONIC]: 0
 };

package/src/test/wallet.ts

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

package/src/types.ts

@@ -5,7 +5,8 @@ export enum Network {
   POLYGON = "polygon",
   OPTIMISM = "optimism",
   ARBITRUM = "arbitrum",
-  BASE = "base"
+  BASE = "base",
+  SONIC = "sonic"
 }
 
 export enum Dapp {
@@ -23,14 +24,14 @@ export enum Dapp {
   VELODROMEV2 = "velodromeV2",
   VELODROMECL = "velodromeCL",
   LYRA = "lyra",
-  ZEROEX = "0x",
   RAMSES = "ramses",
   AERODROME = "aerodrome",
   AERODROMECL = "aerodromeCL",
   RAMSESCL = "ramsesCL",
   PANCAKECL = "pancakeCL",
   COMPOUNDV3 = "compoundV3",
-  ODOS = "odos"
+  ODOS = "odos",
+  SHADOWCL = "shadowCL"
 }
 
 export enum Transaction {

package/dist/services/zeroEx/zeroExTrade.d.ts

@@ -1,3 +0,0 @@
-import { BigNumber } from "ethers";
-import { Network } from "../../types";
-export declare const getZeroExTradeTxData: (network: Network, assetFrom: string, assetTo: string, amountIn: BigNumber | string, slippage: number | undefined, takerAddress: string) => Promise<string>;

package/src/services/zeroEx/zeroExTrade.ts

@@ -1,52 +0,0 @@
-import axios from "axios";
-import { BigNumber } from "ethers";
-import { Network } from "../../types";
-import { ApiError } from "../../errors";
-
-// slippage of 0x is different from that of 1Inch
-// in 0x, e.g. 0.03 for 3% slippage allowed
-// 1inch slippage 0.5% represented by 0.5
-// 0x slippage 0.5% represented by 0.005
-const getZeroExSlippage = (slippage: number): number => {
-  return Number(slippage) / 100;
-};
-
-export const getZeroExTradeTxData = async (
-  network: Network,
-  assetFrom: string,
-  assetTo: string,
-  amountIn: BigNumber | string,
-  slippage = 0.5,
-  takerAddress: string
-): Promise<string> => {
-  if (!process.env.ZEROEX_API_KEY)
-    throw new Error("ZEROEX_API_KEY not configured in .env file");
-  try {
-    const slippagePercentage = getZeroExSlippage(slippage);
-    const params = {
-      buyToken: assetTo,
-      sellToken: assetFrom,
-      sellAmount: amountIn.toString(),
-      // necessary to skip quote validation is that in which the takerAddress refers to a smart contract
-      skipValidation: true,
-      // Used to enable RFQ-T liquidity
-      intentOnFilling: true,
-      takerAddress,
-      slippagePercentage
-      // excludedSourcesParam
-    };
-    const response = await axios.get(
-      `https://${network}.api.0x.org/swap/v1/quote`,
-      {
-        params,
-        headers: {
-          "0x-api-key": process.env.ZEROEX_API_KEY
-        }
-      }
-    );
-
-    return response.data.data;
-  } catch (e) {
-    throw new ApiError("Swap api request of 0x failed");
-  }
-};

package/src/test/zeroEx.test.ts

@@ -1,95 +0,0 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import BigNumber from "bignumber.js";
-import { Dhedge, Pool } from "..";
-import { routerAddress } from "../config";
-import { Dapp, Network } from "../types";
-import { CONTRACT_ADDRESS, MAX_AMOUNT, TEST_POOL } from "./constants";
-import {
-  TestingRunParams,
-  setUSDCAmount,
-  testingHelper
-} from "./utils/testingHelper";
-import { allowanceDelta, balanceDelta } from "./utils/token";
-import { getTxOptions } from "./txOptions";
-
-const testZeroEx = ({ 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(`[${network}] 0x trade`, () => {
-    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(100).times(1e18).toFixed(0),
-        userAddress: pool.address,
-        network,
-        provider
-      });
-    });
-
-    it("approves unlimited USDC on 0x", async () => {
-      await pool.approve(
-        Dapp.ZEROEX,
-        USDC,
-        MAX_AMOUNT,
-        await getTxOptions(network)
-      );
-      const usdcAllowanceDelta = await allowanceDelta(
-        pool.address,
-        USDC,
-        routerAddress[network]["0x"]!,
-        pool.signer
-      );
-      await expect(usdcAllowanceDelta.gt(0));
-    });
-
-    it("trades 2 USDC into WETH on 0x", async () => {
-      await pool.trade(
-        Dapp.ZEROEX,
-        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: testZeroEx
-});
-
-testingHelper({
-  network: Network.POLYGON,
-  testingRun: testZeroEx
-});
-
-testingHelper({
-  network: Network.BASE,
-  testingRun: testZeroEx
-});
-
-testingHelper({
-  network: Network.ARBITRUM,
-  testingRun: testZeroEx
-});