@dhedge/v2-sdk 1.11.0 → 1.11.1

package/dist/entities/pool.d.ts

@@ -178,8 +178,8 @@ export declare class Pool {
      */
     lend(dapp: Dapp, asset: string, amount: BigNumber | string, referralCode?: number, options?: any, estimateGas?: boolean): Promise<any>;
     /**
-     * Lend asset to a Compound V3 style lending pool
-     * @param {string} market Address of market e.g cUSDCv3 address
+     * Lend asset to a Compound V3 or Fluid lending pool
+     * @param {string} market Address of cToken or fToken
      * @param {string} asset Asset
      * @param {BigNumber | string} amount Amount of asset to lend
      * @param {any} options Transaction options
@@ -198,8 +198,8 @@ export declare class Pool {
      */
     withdrawDeposit(dapp: Dapp, asset: string, amount: BigNumber | string, options?: any, estimateGas?: boolean): Promise<any>;
     /**
-     * Witdraw asset from a COmpound V3 style lending pool
-     * @param {string} market Address of market e.g cUSDCv3 address
+     * Witdraw asset from a Compound V3 or Fluid lending pool
+     * @param {string} market Address of cToken or fToken
      * @param {string} asset Asset
      * @param  {BigNumber | string} amount Amount of asset to withdraw
      * @param {any} options Transaction options

package/dist/services/compound/lending.d.ts

@@ -1,3 +1,4 @@
-import { ethers } from "../..";
-export declare function getCompoundV3LendTxData(asset: string, amount: ethers.BigNumber | string): string;
-export declare function getCompoundV3WithdrawTxData(asset: string, amount: ethers.BigNumber | string): string;
+import { ethers, Pool } from "../..";
+export declare function getCompoundV3LendTxData(pool: Pool, market: string, asset: string, amount: ethers.BigNumber | string): Promise<string>;
+export declare function getCompoundV3WithdrawTxData(pool: Pool, market: string, asset: string, amount: ethers.BigNumber | string): Promise<string>;
+export declare function isCompoundV3Market(pool: Pool, market: string): Promise<boolean>;

package/dist/test/constants.d.ts

@@ -37,6 +37,7 @@ export declare const CONTRACT_ADDRESS: {
         VELODROME_CL_USDC_WETH_GAUGE: string;
         VELO: string;
         COMPOUNDV3_WETH: string;
+        FLUID_WETH: string;
         TOROS: string;
         UNIT: string;
     };
@@ -58,6 +59,7 @@ export declare const CONTRACT_ADDRESS: {
         VELODROME_CL_USDC_WETH_GAUGE: string;
         VELO: string;
         COMPOUNDV3_WETH: string;
+        FLUID_WETH: string;
         TOROS: string;
     };
     arbitrum: {
@@ -80,6 +82,7 @@ export declare const CONTRACT_ADDRESS: {
         VELODROME_CL_USDC_WETH_GAUGE: string;
         VELO: string;
         COMPOUNDV3_WETH: string;
+        FLUID_WETH: string;
         TOROS: string;
     };
     base: {
@@ -99,6 +102,7 @@ export declare const CONTRACT_ADDRESS: {
         VELODROME_CL_USDC_WETH_GAUGE: string;
         VELO: string;
         COMPOUNDV3_WETH: string;
+        FLUID_WETH: string;
         TOROS: string;
     };
     ethereum: {
@@ -117,6 +121,7 @@ export declare const CONTRACT_ADDRESS: {
         VELODROME_CL_USDC_WETH_GAUGE: string;
         VELO: string;
         COMPOUNDV3_WETH: string;
+        FLUID_WETH: string;
         TOROS: string;
         UNIT: string;
     };

package/dist/v2-sdk.cjs.development.js

@@ -10514,6 +10514,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "",
   VELO: "",
   COMPOUNDV3_WETH: "",
+  FLUID_WETH: "",
   TOROS: "",
   UNIT: ""
 }, _CONTRACT_ADDRESS[exports.Network.OPTIMISM] = {
@@ -10535,6 +10536,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "0xa75127121d28a9BF848F3B70e7Eea26570aa7700",
   VELO: "0x9560e827aF36c94D2Ac33a39bCE1Fe78631088Db",
   COMPOUNDV3_WETH: "",
+  FLUID_WETH: "",
   TOROS: "0x49bf093277bf4dde49c48c6aa55a3bda3eedef68" //USDmny
 
 }, _CONTRACT_ADDRESS[exports.Network.ARBITRUM] = {
@@ -10558,6 +10560,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "",
   VELO: "",
   COMPOUNDV3_WETH: "0x6f7D514bbD4aFf3BcD1140B7344b32f063dEe486",
+  FLUID_WETH: "0x45df0656f8adf017590009d2f1898eeca4f0a205",
   TOROS: ""
 }, _CONTRACT_ADDRESS[exports.Network.BASE] = {
   USDC: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
@@ -10577,6 +10580,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "0xF33a96b5932D9E9B9A0eDA447AbD8C9d48d2e0c8",
   VELO: "0x940181a94A35A4569E4529A3CDfB74e38FD98631",
   COMPOUNDV3_WETH: "",
+  FLUID_WETH: "",
   TOROS: ""
 }, _CONTRACT_ADDRESS[exports.Network.ETHEREUM] = {
   USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
@@ -10595,6 +10599,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "",
   VELO: "",
   COMPOUNDV3_WETH: "",
+  FLUID_WETH: "",
   TOROS: "",
   UNIT: ""
 }, _CONTRACT_ADDRESS);
@@ -23908,11 +23913,162 @@ var ICompoundV3Comet = [
 	}
 ];
 
-function getCompoundV3LendTxData(asset, amount) {
-  return new ethers.ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("supply", [asset, amount]);
+var IFToken = [
+	{
+		inputs: [
+			{
+				internalType: "uint256",
+				name: "assets_",
+				type: "uint256"
+			},
+			{
+				internalType: "address",
+				name: "receiver_",
+				type: "address"
+			}
+		],
+		name: "deposit",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "shares_",
+				type: "uint256"
+			}
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "uint256",
+				name: "shares_",
+				type: "uint256"
+			},
+			{
+				internalType: "address",
+				name: "receiver_",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "owner_",
+				type: "address"
+			}
+		],
+		name: "redeem",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "assets_",
+				type: "uint256"
+			}
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	}
+];
+
+function getCompoundV3LendTxData(_x, _x2, _x3, _x4) {
+  return _getCompoundV3LendTxData.apply(this, arguments);
 }
-function getCompoundV3WithdrawTxData(asset, amount) {
-  return new ethers.ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("withdraw", [asset, amount]);
+
+function _getCompoundV3LendTxData() {
+  _getCompoundV3LendTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, market, asset, amount) {
+    return runtime_1.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return isCompoundV3Market(pool, market);
+
+          case 2:
+            if (!_context.sent) {
+              _context.next = 6;
+              break;
+            }
+
+            return _context.abrupt("return", new ethers.ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("supply", [asset, amount]));
+
+          case 6:
+            return _context.abrupt("return", new ethers.ethers.utils.Interface(IFToken).encodeFunctionData("deposit", [amount, pool.address]));
+
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _getCompoundV3LendTxData.apply(this, arguments);
+}
+
+function getCompoundV3WithdrawTxData(_x5, _x6, _x7, _x8) {
+  return _getCompoundV3WithdrawTxData.apply(this, arguments);
+}
+
+function _getCompoundV3WithdrawTxData() {
+  _getCompoundV3WithdrawTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, market, asset, amount) {
+    return runtime_1.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return isCompoundV3Market(pool, market);
+
+          case 2:
+            if (!_context2.sent) {
+              _context2.next = 6;
+              break;
+            }
+
+            return _context2.abrupt("return", new ethers.ethers.utils.Interface(ICompoundV3Comet).encodeFunctionData("withdraw", [asset, amount]));
+
+          case 6:
+            return _context2.abrupt("return", new ethers.ethers.utils.Interface(IFToken).encodeFunctionData("redeem", [amount, pool.address, pool.address]));
+
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _getCompoundV3WithdrawTxData.apply(this, arguments);
+}
+
+function isCompoundV3Market(_x9, _x10) {
+  return _isCompoundV3Market.apply(this, arguments);
+}
+
+function _isCompoundV3Market() {
+  _isCompoundV3Market = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, market) {
+    var marketContract;
+    return runtime_1.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            marketContract = new ethers.ethers.Contract(market, ICompoundV3Comet, pool.signer);
+            _context3.prev = 1;
+            _context3.next = 4;
+            return marketContract.baseToken();
+
+          case 4:
+            return _context3.abrupt("return", true);
+
+          case 7:
+            _context3.prev = 7;
+            _context3.t0 = _context3["catch"](1);
+            return _context3.abrupt("return", false);
+
+          case 10:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3, null, [[1, 7]]);
+  }));
+  return _isCompoundV3Market.apply(this, arguments);
 }
 
 var ICometRewards = [
@@ -25820,8 +25976,8 @@ var Pool = /*#__PURE__*/function () {
     return lend;
   }()
   /**
-   * Lend asset to a Compound V3 style lending pool
-   * @param {string} market Address of market e.g cUSDCv3 address
+   * Lend asset to a Compound V3 or Fluid lending pool
+   * @param {string} market Address of cToken or fToken
    * @param {string} asset Asset
    * @param {BigNumber | string} amount Amount of asset to lend
    * @param {any} options Transaction options
@@ -25847,15 +26003,19 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              supplyTxData = getCompoundV3LendTxData(asset, amount);
-              _context18.next = 5;
+              _context18.next = 4;
+              return getCompoundV3LendTxData(this, market, asset, amount);
+
+            case 4:
+              supplyTxData = _context18.sent;
+              _context18.next = 7;
               return getPoolTxOrGasEstimate(this, [market, supplyTxData, options], estimateGas);
 
-            case 5:
+            case 7:
               tx = _context18.sent;
               return _context18.abrupt("return", tx);
 
-            case 7:
+            case 9:
             case "end":
               return _context18.stop();
           }
@@ -25921,8 +26081,8 @@ var Pool = /*#__PURE__*/function () {
     return withdrawDeposit;
   }()
   /**
-   * Witdraw asset from a COmpound V3 style lending pool
-   * @param {string} market Address of market e.g cUSDCv3 address
+   * Witdraw asset from a Compound V3 or Fluid lending pool
+   * @param {string} market Address of cToken or fToken
    * @param {string} asset Asset
    * @param  {BigNumber | string} amount Amount of asset to withdraw
    * @param {any} options Transaction options
@@ -25948,15 +26108,19 @@ var Pool = /*#__PURE__*/function () {
                 estimateGas = false;
               }
 
-              withdrawTxData = getCompoundV3WithdrawTxData(asset, amount);
-              _context20.next = 5;
+              _context20.next = 4;
+              return getCompoundV3WithdrawTxData(this, market, asset, amount);
+
+            case 4:
+              withdrawTxData = _context20.sent;
+              _context20.next = 7;
               return getPoolTxOrGasEstimate(this, [market, withdrawTxData, options], estimateGas);
 
-            case 5:
+            case 7:
               tx = _context20.sent;
               return _context20.abrupt("return", tx);
 
-            case 7:
+            case 9:
             case "end":
               return _context20.stop();
           }