@dhedge/v2-sdk 2.2.1 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhedge/v2-sdk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "MIT",
   "description": "🛠 An SDK for building applications on top of dHEDGE V2",
   "main": "dist/index.js",

package/src/abi/dytm/IOffice.json

@@ -0,0 +1,191 @@
+[
+	{
+		"inputs": [
+			{
+				"components": [
+					{
+						"internalType": "AccountId",
+						"name": "account",
+						"type": "uint256"
+					},
+					{
+						"internalType": "ReserveKey",
+						"name": "key",
+						"type": "uint248"
+					},
+					{
+						"internalType": "address",
+						"name": "receiver",
+						"type": "address"
+					},
+					{
+						"internalType": "uint256",
+						"name": "assets",
+						"type": "uint256"
+					},
+					{
+						"internalType": "bytes",
+						"name": "extraData",
+						"type": "bytes"
+					}
+				],
+				"internalType": "struct BorrowParams",
+				"name": "params",
+				"type": "tuple"
+			}
+		],
+		"name": "borrow",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "debtShares",
+				"type": "uint256"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"components": [
+					{
+						"internalType": "AccountId",
+						"name": "account",
+						"type": "uint256"
+					},
+					{
+						"internalType": "ReserveKey",
+						"name": "key",
+						"type": "uint248"
+					},
+					{
+						"internalType": "enum TokenType",
+						"name": "withCollateralType",
+						"type": "uint8"
+					},
+					{
+						"internalType": "uint256",
+						"name": "assets",
+						"type": "uint256"
+					},
+					{
+						"internalType": "uint256",
+						"name": "shares",
+						"type": "uint256"
+					},
+					{
+						"internalType": "bytes",
+						"name": "extraData",
+						"type": "bytes"
+					}
+				],
+				"internalType": "struct RepayParams",
+				"name": "params",
+				"type": "tuple"
+			}
+		],
+		"name": "repay",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "assetsRepaid",
+				"type": "uint256"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"components": [
+					{
+						"internalType": "AccountId",
+						"name": "account",
+						"type": "uint256"
+					},
+					{
+						"internalType": "uint256",
+						"name": "tokenId",
+						"type": "uint256"
+					},
+					{
+						"internalType": "uint256",
+						"name": "assets",
+						"type": "uint256"
+					},
+					{
+						"internalType": "bytes",
+						"name": "extraData",
+						"type": "bytes"
+					}
+				],
+				"internalType": "struct SupplyParams",
+				"name": "params",
+				"type": "tuple"
+			}
+		],
+		"name": "supply",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "shares",
+				"type": "uint256"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	},
+	{
+		"inputs": [
+			{
+				"components": [
+					{
+						"internalType": "AccountId",
+						"name": "account",
+						"type": "uint256"
+					},
+					{
+						"internalType": "uint256",
+						"name": "tokenId",
+						"type": "uint256"
+					},
+					{
+						"internalType": "address",
+						"name": "receiver",
+						"type": "address"
+					},
+					{
+						"internalType": "uint256",
+						"name": "assets",
+						"type": "uint256"
+					},
+					{
+						"internalType": "uint256",
+						"name": "shares",
+						"type": "uint256"
+					},
+					{
+						"internalType": "bytes",
+						"name": "extraData",
+						"type": "bytes"
+					}
+				],
+				"internalType": "struct WithdrawParams",
+				"name": "params",
+				"type": "tuple"
+			}
+		],
+		"name": "withdraw",
+		"outputs": [
+			{
+				"internalType": "uint256",
+				"name": "assets",
+				"type": "uint256"
+			}
+		],
+		"stateMutability": "nonpayable",
+		"type": "function"
+	}
+]

package/src/config.ts

@@ -61,7 +61,8 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.TOROS]: "0xA5679C4272A056Bb83f039961fae7D99C48529F5",
     [Dapp.ODOS]: "0x0D05a7D3448512B78fa8A9e46c4872C88C4a0D05",
     [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946",
-    [Dapp.KYBERSWAP]: "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5"
+    [Dapp.KYBERSWAP]: "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5",
+    [Dapp.DYTM]: "0x0fF1CEE337d7af25eEF4c1a7A2CaF83f98d80001"
   },
   [Network.BASE]: {
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
@@ -78,7 +79,8 @@ export const routerAddress: AddressDappNetworkMap = {
     [Dapp.PENDLE]: "0x888888888889758F76e7103c6CbF23ABbF58F946",
     [Dapp.ONEINCH]: "0x111111125421ca6dc452d289314280a0f8842a65",
     [Dapp.KYBERSWAP]: "0x6131B5fae19EA4f9D964eAc0408E4408b66337b5",
-    [Dapp.ONDO]: "0xde41399145F23936b03dD1474eC16c1519c0DC2a"
+    [Dapp.ONDO]: "0xde41399145F23936b03dD1474eC16c1519c0DC2a",
+    [Dapp.DYTM]: "0x0ff1ce991105DD1a8e26bC8a974Fd0154398Df0f"
   },
   [Network.PLASMA]: {
     [Dapp.AAVEV3]: "0x925a2A7214Ed92428B5b1B090F80b25700095e12",
@@ -276,3 +278,19 @@ export const OdosSwapFeeRecipient = {
   [Network.PLASMA]: "",
   [Network.HYPERLIQUID]: ""
 };
+
+export const dytmContractAddresses: Readonly<Partial<
+  Record<
+    Network,
+    {
+      Periphery?: string;
+    }
+  >
+>> = {
+  [Network.ARBITRUM]: {
+    Periphery: "0x1FBe7Bb394BE505C08e9ee419Dd166c71004e51B"
+  },
+  [Network.ETHEREUM]: {
+    Periphery: "0xbc632a1A4bD878D7e7D14ea6CfE0DDe3Fc291D1a"
+  }
+};

package/src/entities/pool.ts

@@ -77,7 +77,17 @@ import {
 } from "../services/pancake/staking";
 import { getOdosSwapTxData } from "../services/odos";
 import { getPendleMintTxData, getPendleSwapTxData } from "../services/pendle";
-import { getCompleteWithdrawalTxData } from "../services/toros/completeWithdrawal";
+import {
+  getCompleteWithdrawalTxData,
+  TrackedAsset
+} from "../services/toros/completeWithdrawal";
+import {
+  getDytmBorrowTxData,
+  getDytmDepositTxData,
+  getDytmRepayTxData,
+  getDytmWithdrawTxData
+} from "../services/dytm";
+
 import {
   getCreateLimitOrderTxData,
   getModifyLimitOrderTxData,
@@ -417,13 +427,13 @@ export class Pool {
         );
         break;
       case Dapp.TOROS:
-        swapTxData = await getEasySwapperTxData(
+        ({ swapTxData, minAmountOut } = await getEasySwapperTxData(
           this,
           assetFrom,
           assetTo,
           ethers.BigNumber.from(amountIn),
           slippage
-        );
+        ));
         break;
       case Dapp.ODOS:
         ({ swapTxData, minAmountOut } = await getOdosSwapTxData(
@@ -796,13 +806,18 @@ export class Pool {
       estimateGas: false
     }
   ): Promise<any> {
-    const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
-    const depositTxData = iLendingPool.encodeFunctionData(Transaction.DEPOSIT, [
-      asset,
-      amount,
-      this.address,
-      referralCode
-    ]);
+    let depositTxData: string;
+    if (dapp === Dapp.DYTM) {
+      depositTxData = getDytmDepositTxData(this, asset, amount);
+    } else {
+      const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
+      depositTxData = iLendingPool.encodeFunctionData(Transaction.DEPOSIT, [
+        asset,
+        amount,
+        this.address,
+        referralCode
+      ]);
+    }
 
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -863,11 +878,17 @@ export class Pool {
       estimateGas: false
     }
   ): Promise<any> {
-    const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
-    const withdrawTxData = iLendingPool.encodeFunctionData(
-      Transaction.WITHDRAW,
-      [asset, amount, this.address]
-    );
+    let withdrawTxData: string;
+    if (dapp === Dapp.DYTM) {
+      withdrawTxData = await getDytmWithdrawTxData(this, asset, amount);
+    } else {
+      const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
+      withdrawTxData = iLendingPool.encodeFunctionData(Transaction.WITHDRAW, [
+        asset,
+        amount,
+        this.address
+      ]);
+    }
 
     const tx = await getPoolTxOrGasEstimate(
       this,
@@ -930,14 +951,19 @@ export class Pool {
       estimateGas: false
     }
   ): Promise<any> {
-    const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
-    const borrowTxData = iLendingPool.encodeFunctionData(Transaction.BORROW, [
-      asset,
-      amount,
-      2,
-      referralCode,
-      this.address
-    ]);
+    let borrowTxData: string;
+    if (dapp === Dapp.DYTM) {
+      borrowTxData = getDytmBorrowTxData(this, asset, amount);
+    } else {
+      const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
+      borrowTxData = iLendingPool.encodeFunctionData(Transaction.BORROW, [
+        asset,
+        amount,
+        2,
+        referralCode,
+        this.address
+      ]);
+    }
     const tx = await getPoolTxOrGasEstimate(
       this,
       [routerAddress[this.network][dapp], borrowTxData, options],
@@ -964,13 +990,18 @@ export class Pool {
       estimateGas: false
     }
   ): Promise<any> {
-    const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
-    const repayTxData = iLendingPool.encodeFunctionData(Transaction.REPAY, [
-      asset,
-      amount,
-      2,
-      this.address
-    ]);
+    let repayTxData: string;
+    if (dapp === Dapp.DYTM) {
+      repayTxData = await getDytmRepayTxData(this, asset, amount);
+    } else {
+      const iLendingPool = new ethers.utils.Interface(ILendingPool.abi);
+      repayTxData = iLendingPool.encodeFunctionData(Transaction.REPAY, [
+        asset,
+        amount,
+        2,
+        this.address
+      ]);
+    }
     const tx = await getPoolTxOrGasEstimate(
       this,
       [routerAddress[this.network][dapp], repayTxData, options],
@@ -1963,6 +1994,7 @@ export class Pool {
    * @param {number} slippage Slippage tolerance in %
    * @param {any} options Transaction options
    * @param {SDKOptions} sdkOptions SDK options including estimateGas
+   * @param {any} trackedAssets Tracked assets information (only for tx data generation)
    * @returns {Promise<any>} Transaction
    */
   async completeTorosWithdrawal(
@@ -1971,13 +2003,15 @@ export class Pool {
     options: any = null,
     sdkOptions: SDKOptions = {
       estimateGas: false
-    }
+    },
+    trackedAssets: TrackedAsset[] = []
   ): Promise<any> {
     const txData = await getCompleteWithdrawalTxData(
       this,
       destinationToken,
       slippage * 100,
-      false
+      false,
+      trackedAssets
     );
     const tx = await getPoolTxOrGasEstimate(
       this,

package/src/services/dytm/index.ts

@@ -0,0 +1,77 @@
+import { ethers } from "ethers";
+import IOffice from "../../abi/dytm/IOffice.json";
+import { Pool } from "../../entities";
+
+const iOffice = new ethers.utils.Interface(IOffice);
+
+export function toDebtId(key: ethers.BigNumber): ethers.BigNumber {
+  const tokenTypeBits = ethers.BigNumber.from(3).shl(248);
+  return tokenTypeBits.or(key);
+}
+
+export const getDytmDepositTxData = (
+  pool: Pool,
+  asset: string,
+  amount: ethers.BigNumber | string
+): string => {
+  return iOffice.encodeFunctionData("supply", [
+    {
+      account: ethers.BigNumber.from(pool.address), // uint256 (converted address)
+      tokenId: asset,
+      assets: amount,
+      extraData: "0x"
+    }
+  ]);
+};
+
+export const getDytmBorrowTxData = (
+  pool: Pool,
+  asset: string,
+  amount: ethers.BigNumber | string
+): string => {
+  return iOffice.encodeFunctionData("borrow", [
+    {
+      account: ethers.BigNumber.from(pool.address), // uint256 (converted address)
+      key: asset,
+      receiver: pool.address,
+      assets: amount,
+      extraData: "0x"
+    }
+  ]);
+};
+
+export const getDytmRepayTxData = async (
+  pool: Pool,
+  asset: string,
+  amount: ethers.BigNumber | string
+): Promise<string> => {
+  return iOffice.encodeFunctionData("repay", [
+    {
+      account: ethers.BigNumber.from(pool.address), // uint256 (converted address)
+      key: asset,
+      withCollateralType: "0",
+      assets: amount,
+      shares: "0",
+      extraData: "0x"
+    }
+  ]);
+};
+export const getDytmWithdrawTxData = async (
+  pool: Pool,
+  asset: string,
+  amount: ethers.BigNumber | string
+): Promise<string> => {
+  const isMaxAmount = ethers.BigNumber.from(amount).eq(
+    ethers.constants.MaxUint256
+  );
+  return iOffice.encodeFunctionData("withdraw", [
+    {
+      account: ethers.BigNumber.from(pool.address), // uint256 (converted address)
+      tokenId: asset,
+      assets: isMaxAmount ? 0 : amount,
+      shares: isMaxAmount ? amount : 0,
+      receiver: pool.address,
+      extraData: "0x"
+    }
+  ]);
+};

package/src/services/toros/completeWithdrawal.ts

@@ -70,19 +70,23 @@ const getSwapWithdrawData = async (
   }
   throw new Error("All swap routers failed for complete withdrawal");
 };
+
 export const createCompleteWithdrawalTxArguments = async (
   pool: Pool,
   receiveToken: string,
-  slippage: number
+  slippage: number,
+  _trackedAssets: TrackedAsset[]
 ): Promise<any> => {
   const easySwapper = new ethers.Contract(
     routerAddress[pool.network][Dapp.TOROS] as string,
     IEasySwapperV2,
     pool.signer
   );
-  const trackedAssets: TrackedAsset[] = await easySwapper.getTrackedAssets(
-    pool.address
-  );
+
+  let trackedAssets: TrackedAsset[] = _trackedAssets;
+  if (trackedAssets.length === 0) {
+    trackedAssets = await easySwapper.getTrackedAssets(pool.address);
+  }
 
   if (
     trackedAssets.length === 0 ||
@@ -170,10 +174,20 @@ export const createCompleteWithdrawalTxArguments = async (
   const withdrawalVaultAddress = await easySwapper.withdrawalContracts(
     pool.address
   );
-  const balanceOfReceiveToken = await receiveTokenErc20.balanceOf(
+  let balanceOfReceiveToken = await receiveTokenErc20.balanceOf(
     withdrawalVaultAddress
   );
 
+  if (trackedAssets.length !== 0) {
+    //  finds the receiveTokenErc20's balance inside trackedAssets
+    const trackedAsset = trackedAssets.find(
+      ({ token }) => token.toLowerCase() === receiveToken.toLowerCase()
+    );
+    if (trackedAsset) {
+      balanceOfReceiveToken = balanceOfReceiveToken.add(trackedAsset.balance);
+    }
+  }
+
   // complete withdraw _expectedDestTokenAmount
   const estimatedMinReceiveAmount = swapDestMinDestAmount.plus(
     balanceOfReceiveToken.toString()
@@ -201,12 +215,14 @@ export const getCompleteWithdrawalTxData = async (
   pool: Pool,
   receiveToken: string,
   slippage: number,
-  useOnChainSwap: boolean
+  useOnChainSwap: boolean,
+  trackedAssets: TrackedAsset[]
 ): Promise<string> => {
   const completeWithdrawTxArguments = await createCompleteWithdrawalTxArguments(
     pool,
     receiveToken,
-    slippage
+    slippage,
+    trackedAssets
   );
 
   const isSwapNeeded = completeWithdrawTxArguments.isSwapNeeded;

package/src/services/toros/easySwapper.ts

@@ -70,7 +70,7 @@ export async function getEasySwapperTxData(
   amountIn: ethers.BigNumber,
   slippage: number
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> {
+): Promise<{ swapTxData: string; minAmountOut?: any }> {
   const isWithdrawal = await isPool(pool, assetFrom);
   const [torosAsset, investAsset] = isWithdrawal
     ? [assetFrom, assetTo]
@@ -99,11 +99,13 @@ export async function getEasySwapperTxData(
       investAsset,
       amountIn
     );
-    return iEasySwapperV2.encodeFunctionData("depositWithCustomCooldown", [
-      torosAsset,
-      depositAsset,
-      amountIn,
-      minAmountOut.mul(10000 - slippage * 100).div(10000)
-    ]);
+    const _minAmountOut = minAmountOut.mul(10000 - slippage * 100).div(10000);
+    return {
+      swapTxData: iEasySwapperV2.encodeFunctionData(
+        "depositWithCustomCooldown",
+        [torosAsset, depositAsset, amountIn, _minAmountOut]
+      ),
+      minAmountOut: _minAmountOut
+    };
   }
 }

package/src/services/toros/initWithdrawal.ts

@@ -157,7 +157,7 @@ export const getInitWithdrawalTxData = async (
   amountIn: string,
   slippage: number,
   useOnChainSwap: boolean
-): Promise<string> => {
+): Promise<{ swapTxData: string; minAmountOut?: any }> => {
   const complexAssetsData = await createWithdrawTxArguments(
     pool,
     torosAsset,
@@ -166,9 +166,13 @@ export const getInitWithdrawalTxData = async (
     useOnChainSwap
   );
   const iEasySwapperV2 = new ethers.utils.Interface(IEasySwapperV2);
-  return iEasySwapperV2.encodeFunctionData("initWithdrawal", [
-    torosAsset,
-    amountIn,
-    complexAssetsData
-  ]);
+
+  return {
+    swapTxData: iEasySwapperV2.encodeFunctionData("initWithdrawal", [
+      torosAsset,
+      amountIn,
+      complexAssetsData
+    ]),
+    minAmountOut: null // not be used when building multicall tx data
+  };
 };