@dhedge/v2-sdk 1.10.10 → 1.10.11

package/dist/config.d.ts

@@ -14,8 +14,9 @@ export declare const MaxUint128 = "0xffffffffffffffffffffffffffffffff";
 export declare const UNISWAPV3_QUOTER_ADDRESS = "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6";
 export declare const SYNTHETIX_TRACKING_CODE = "0x4448454447450000000000000000000000000000000000000000000000000000";
 export declare const flatMoneyContractAddresses: Readonly<Partial<Record<Network, {
+    OrderExecution?: string;
     DelayedOrder: string;
     FlatcoinVault: string;
     StableModule: string;
-    RETH: string;
+    COLLATERAL: string;
 }>>>;

package/dist/entities/dhedge.d.ts

@@ -25,7 +25,7 @@ export declare class Dhedge {
      * @param {string} address Pool address
      * @returns {Pool} Loaded Pool
      */
-    loadPool(address: string): Promise<Pool>;
+    loadPool(address: string, isDhedge?: boolean): Promise<Pool>;
     /**
      * Check if pool address is valid
      * @param {string} address Pool address

package/dist/entities/pool.d.ts

@@ -9,7 +9,8 @@ export declare class Pool {
     readonly address: string;
     readonly utils: Utils;
     readonly network: Network;
-    constructor(network: Network, signer: Wallet, poolLogic: Contract, mangerLogic: Contract, utils: Utils, factory: Contract);
+    readonly isDhedge: boolean;
+    constructor(network: Network, signer: Wallet, poolLogic: Contract, mangerLogic: Contract, utils: Utils, factory: Contract, isDhedge?: boolean);
     /**
      * Return the assets with balances and deposit info of a pool
      * @returns {Promise<FundComposition[]>} Composition of assets with balance, deposit info

package/dist/services/flatmoney/stableLp.d.ts

@@ -2,6 +2,7 @@ import { Pool, ethers } from "../..";
 export declare function getAnnounceStableDepositTxData(depositAmount: ethers.BigNumber | string, minAmountOut: ethers.BigNumber | string, keeperFee: ethers.BigNumber | string): string;
 export declare function getAnnounceStableWithdrawTxData(withdrawAmount: ethers.BigNumber | string, minAmountOut: ethers.BigNumber | string, keeperFee: ethers.BigNumber | string): string;
 export declare function getCancelExistingOrderTxData(account: string): string;
+export declare function getCancelExistingOrderTxDataForV2(account: string): string;
 export declare function mintUnitViaFlatMoney(pool: Pool, depositAmount: ethers.BigNumber | string, slippage: number, // 0.5 means 0.5%
 maxKeeperFeeInUsd: number | null, options?: any, estimateGas?: boolean): Promise<any>;
 export declare function redeemUnitViaFlatMoney(pool: Pool, withdrawAmount: ethers.BigNumber | string, slippage: number, // 0.5 means 0.5%

package/dist/test/constants.d.ts

@@ -37,6 +37,7 @@ export declare const CONTRACT_ADDRESS: {
         VELO: string;
         COMPOUNDV3_WETH: string;
         TOROS: string;
+        UNIT: string;
     };
     optimism: {
         USDC: string;
@@ -49,6 +50,7 @@ export declare const CONTRACT_ADDRESS: {
         uniswapV3: {
             nonfungiblePositionManager: string;
         };
+        UNIT: string;
         WMATIC: string;
         ARRAKIS_USDC_WETH_GAUGE: string;
         ARRAKIS_USDC_WETH_LP: string;
@@ -70,6 +72,7 @@ export declare const CONTRACT_ADDRESS: {
         uniswapV3: {
             nonfungiblePositionManager: string;
         };
+        UNIT: string;
         ARRAKIS_USDC_WETH_GAUGE: string;
         ARRAKIS_USDC_WETH_LP: string;
         WMATIC: string;
@@ -85,6 +88,7 @@ export declare const CONTRACT_ADDRESS: {
         WETH: string;
         WBTC: string;
         SWETH: string;
+        UNIT: string;
         uniswapV3: {
             nonfungiblePositionManager: string;
         };

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

@@ -53,6 +53,24 @@ function _asyncToGenerator(fn) {
   };
 }
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _inheritsLoose(subClass, superClass) {
   subClass.prototype = Object.create(superClass.prototype);
   subClass.prototype.constructor = subClass;
@@ -4306,7 +4324,14 @@ var flatMoneyContractAddresses = (_flatMoneyContractAdd = {}, _flatMoneyContract
   DelayedOrder: "0x6D857e9D24a7566bB72a3FB0847A3E0e4E1c2879",
   FlatcoinVault: "0x95Fa1ddc9a78273f795e67AbE8f1Cd2Cd39831fF",
   StableModule: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
-  RETH: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c"
+  COLLATERAL: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c" // RETH
+
+}, _flatMoneyContractAdd[exports.Network.OPTIMISM] = {
+  OrderExecution: "0x7805CB7fb2C2e70FDdF92949065D9Ee1Fc2F72a8",
+  DelayedOrder: "0xd917A0C9B21Bb71DF1209d2c211Ad83004F01554",
+  FlatcoinVault: "0x86C7b9640302082B0dF78023F930d8612bFcaD3f",
+  COLLATERAL: "0x68f180fcCe6836688e9084f035309E29Bf0A2095",
+  StableModule: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5"
 }, _flatMoneyContractAdd);
 
 var abi$3 = [
@@ -10482,7 +10507,8 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "",
   VELO: "",
   COMPOUNDV3_WETH: "",
-  TOROS: ""
+  TOROS: "",
+  UNIT: ""
 }, _CONTRACT_ADDRESS[exports.Network.OPTIMISM] = {
   USDC: "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
   USDT: "",
@@ -10494,6 +10520,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   uniswapV3: {
     nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
   },
+  UNIT: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5",
   WMATIC: "",
   //
   ARRAKIS_USDC_WETH_GAUGE: "",
@@ -10516,6 +10543,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   uniswapV3: {
     nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
   },
+  UNIT: "",
   //
   ARRAKIS_USDC_WETH_GAUGE: "",
   ARRAKIS_USDC_WETH_LP: "",
@@ -10531,6 +10559,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   WETH: "0x4200000000000000000000000000000000000006",
   WBTC: "",
   SWETH: "",
+  UNIT: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
   uniswapV3: {
     nonfungiblePositionManager: ""
   },
@@ -16073,25 +16102,59 @@ var getPoolTxOrGasEstimate = /*#__PURE__*/function () {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
+            if (!pool.isDhedge) {
+              _context2.next = 12;
+              break;
+            }
+
             if (!estimateGas) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
 
-            _context2.next = 3;
+            _context2.next = 4;
             return pool.poolLogic.estimateGas.execTransaction(args[0], args[1], args[2]);
 
-          case 3:
+          case 4:
             return _context2.abrupt("return", _context2.sent);
 
-          case 6:
-            _context2.next = 8;
+          case 7:
+            _context2.next = 9;
             return pool.poolLogic.execTransaction(args[0], args[1], args[2]);
 
-          case 8:
+          case 9:
             return _context2.abrupt("return", _context2.sent);
 
-          case 9:
+          case 10:
+            _context2.next = 21;
+            break;
+
+          case 12:
+            if (!estimateGas) {
+              _context2.next = 18;
+              break;
+            }
+
+            _context2.next = 15;
+            return pool.signer.estimateGas({
+              to: args[0],
+              data: args[1]
+            });
+
+          case 15:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 18:
+            _context2.next = 20;
+            return pool.signer.sendTransaction(_extends({
+              to: args[0],
+              data: args[1]
+            }, args[2]));
+
+          case 20:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 21:
           case "end":
             return _context2.stop();
         }
@@ -21535,6 +21598,108 @@ var DelayedOrderAbi = [
 	}
 ];
 
+var IOrderExecutionModuleAbi = [
+	{
+		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"
+	}
+];
+
 var StableModuleAbi = [
 	{
 		inputs: [
@@ -23409,7 +23574,7 @@ var getKeeperFeeContract = /*#__PURE__*/function () {
 }();
 var getKeeperFee = /*#__PURE__*/function () {
   var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, maxKeeperFeeInUsd) {
-    var keeperFeeContract, gasPrice, keeperfee, keeperFeeInUsd;
+    var keeperFeeContract, feeHistory, gasPrice, keeperfee, keeperFeeInUsd;
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -23420,49 +23585,50 @@ var getKeeperFee = /*#__PURE__*/function () {
           case 2:
             keeperFeeContract = _context2.sent;
             _context2.next = 5;
-            return pool.signer.provider.getGasPrice();
+            return pool.signer.provider.send("eth_feeHistory", [1, "latest"]);
 
           case 5:
-            gasPrice = _context2.sent;
+            feeHistory = _context2.sent;
+            gasPrice = Number(feeHistory.baseFeePerGas[0]);
 
             if (!gasPrice) {
-              _context2.next = 12;
+              _context2.next = 13;
               break;
             }
 
-            _context2.next = 9;
-            return keeperFeeContract["getKeeperFee(uint256)"](new BigNumber(gasPrice.toString()).times(1.2).toFixed(0));
+            _context2.next = 10;
+            return keeperFeeContract["getKeeperFee(uint256)"](new BigNumber(gasPrice.toString()).times(1.5).toFixed(0));
 
-          case 9:
+          case 10:
             keeperfee = _context2.sent;
-            _context2.next = 15;
+            _context2.next = 16;
             break;
 
-          case 12:
-            _context2.next = 14;
+          case 13:
+            _context2.next = 15;
             return keeperFeeContract["getKeeperFee()"]();
 
-          case 14:
+          case 15:
             keeperfee = _context2.sent;
 
-          case 15:
-            _context2.next = 17;
+          case 16:
+            _context2.next = 18;
             return getKeeperFeeInUsd(pool, keeperfee);
 
-          case 17:
+          case 18:
             keeperFeeInUsd = _context2.sent;
 
             if (!(Number.isFinite(maxKeeperFeeInUsd) && keeperFeeInUsd.gt(ethers.ethers.BigNumber.from(maxKeeperFeeInUsd).toString()))) {
-              _context2.next = 20;
+              _context2.next = 21;
               break;
             }
 
             throw new Error("mintUnitViaFlatMoney: keeperFee too large");
 
-          case 20:
+          case 21:
             return _context2.abrupt("return", keeperfee);
 
-          case 21:
+          case 22:
           case "end":
             return _context2.stop();
         }
@@ -23476,7 +23642,7 @@ var getKeeperFee = /*#__PURE__*/function () {
 }();
 var getKeeperFeeInUsd = /*#__PURE__*/function () {
   var _ref3 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, keeperFee) {
-    var flatMoneyContracts, fundComposition, filteredFc, rateD1;
+    var flatMoneyContracts, fundComposition, filteredFc, rateD1, assetDecimal;
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -23497,7 +23663,7 @@ var getKeeperFeeInUsd = /*#__PURE__*/function () {
           case 5:
             fundComposition = _context3.sent;
             filteredFc = fundComposition.filter(function (fc) {
-              return fc.asset.toLocaleLowerCase() === flatMoneyContracts.RETH.toLocaleLowerCase();
+              return fc.asset.toLocaleLowerCase() === flatMoneyContracts.COLLATERAL.toLocaleLowerCase();
             });
 
             if (filteredFc[0]) {
@@ -23509,9 +23675,14 @@ var getKeeperFeeInUsd = /*#__PURE__*/function () {
 
           case 9:
             rateD1 = new BigNumber(filteredFc[0].rate.toString()).div(1e18);
-            return _context3.abrupt("return", rateD1.times(keeperFee.toString()).div(1e18));
+            _context3.next = 12;
+            return pool.utils.getDecimals(flatMoneyContracts.COLLATERAL);
 
-          case 11:
+          case 12:
+            assetDecimal = _context3.sent;
+            return _context3.abrupt("return", rateD1.times(keeperFee.toString()).div(Math.pow(10, assetDecimal)));
+
+          case 14:
           case "end":
             return _context3.stop();
         }
@@ -23533,6 +23704,9 @@ function getAnnounceStableWithdrawTxData(withdrawAmount, minAmountOut, keeperFee
 function getCancelExistingOrderTxData(account) {
   return new ethers.ethers.utils.Interface(DelayedOrderAbi).encodeFunctionData("cancelExistingOrder", [account]);
 }
+function getCancelExistingOrderTxDataForV2(account) {
+  return new ethers.ethers.utils.Interface(IOrderExecutionModuleAbi).encodeFunctionData("cancelExistingOrder", [account]);
+}
 function mintUnitViaFlatMoney(_x, _x2, _x3, _x4, _x5, _x6) {
   return _mintUnitViaFlatMoney.apply(this, arguments);
 }
@@ -23568,7 +23742,7 @@ function _mintUnitViaFlatMoney() {
 
           case 7:
             keeperfee = _context.sent;
-            // in RETH
+            // in COLLATERAL
             adjustedDepositAmount = new BigNumber(depositAmount.toString()).minus(keeperfee.toString() // keeper fee deducted from amountIn
             );
             _context.next = 11;
@@ -23669,7 +23843,7 @@ function cancelOrderViaFlatMoney(_x13, _x14, _x15) {
 
 function _cancelOrderViaFlatMoney() {
   _cancelOrderViaFlatMoney = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, options, estimateGas) {
-    var flatMoneyContracts, cancelOrderTxData, tx;
+    var flatMoneyContracts, toAddress, cancelOrderTxData, tx;
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -23692,19 +23866,46 @@ function _cancelOrderViaFlatMoney() {
             throw new Error("cancelOrderViaFlatMoney: network not supported");
 
           case 5:
-            _context3.next = 7;
-            return getCancelExistingOrderTxData(pool.address);
+            // flat money v2
+            // use OrderExecution module to cancel order
+            toAddress = flatMoneyContracts.DelayedOrder;
+            cancelOrderTxData = getCancelExistingOrderTxData(pool.address);
 
-          case 7:
+            if (!flatMoneyContracts.OrderExecution) {
+              _context3.next = 12;
+              break;
+            }
+
+            toAddress = flatMoneyContracts.OrderExecution;
+            _context3.next = 11;
+            return getCancelExistingOrderTxDataForV2(pool.address);
+
+          case 11:
             cancelOrderTxData = _context3.sent;
-            _context3.next = 10;
-            return getPoolTxOrGasEstimate(pool, [flatMoneyContracts.DelayedOrder, cancelOrderTxData, options], estimateGas);
 
-          case 10:
+          case 12:
+            if (!estimateGas) {
+              _context3.next = 16;
+              break;
+            }
+
+            return _context3.abrupt("return", pool.signer.estimateGas({
+              to: toAddress,
+              data: cancelOrderTxData
+            }));
+
+          case 16:
+            _context3.next = 18;
+            return pool.signer.sendTransaction(_extends({
+              to: toAddress,
+              data: cancelOrderTxData
+            }, options));
+
+          case 18:
             tx = _context3.sent;
             return _context3.abrupt("return", tx);
 
-          case 12:
+          case 20:
           case "end":
             return _context3.stop();
         }
@@ -24284,7 +24485,11 @@ function _getOdosSwapTxData() {
 }
 
 var Pool = /*#__PURE__*/function () {
-  function Pool(network, signer, poolLogic, mangerLogic, utils, factory) {
+  function Pool(network, signer, poolLogic, mangerLogic, utils, factory, isDhedge) {
+    if (isDhedge === void 0) {
+      isDhedge = true;
+    }
+
     this.network = network;
     this.poolLogic = poolLogic;
     this.address = poolLogic.address;
@@ -24292,6 +24497,7 @@ var Pool = /*#__PURE__*/function () {
     this.signer = signer;
     this.utils = utils;
     this.factory = factory;
+    this.isDhedge = isDhedge;
   }
   /**
    * Return the assets with balances and deposit info of a pool
@@ -31105,22 +31311,35 @@ var Dhedge = /*#__PURE__*/function () {
   _proto.loadPool =
   /*#__PURE__*/
   function () {
-    var _loadPool = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(address) {
+    var _loadPool = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(address, isDhedge) {
       var poolLogic, managerLogicAddress, managerLogic;
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              if (isDhedge === void 0) {
+                isDhedge = true;
+              }
+
               poolLogic = new ethers.Contract(address, PoolLogic.abi, this.signer);
-              _context2.next = 3;
+              managerLogicAddress = address;
+
+              if (!isDhedge) {
+                _context2.next = 7;
+                break;
+              }
+
+              _context2.next = 6;
               return poolLogic.poolManagerLogic();
 
-            case 3:
+            case 6:
               managerLogicAddress = _context2.sent;
+
+            case 7:
               managerLogic = new ethers.Contract(managerLogicAddress, ManagerLogic.abi, this.signer);
-              return _context2.abrupt("return", new Pool(this.network, this.signer, poolLogic, managerLogic, this.utils, this.factory));
+              return _context2.abrupt("return", new Pool(this.network, this.signer, poolLogic, managerLogic, this.utils, this.factory, isDhedge));
 
-            case 6:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -31128,7 +31347,7 @@ var Dhedge = /*#__PURE__*/function () {
       }, _callee2, this);
     }));
 
-    function loadPool(_x7) {
+    function loadPool(_x7, _x8) {
       return _loadPool.apply(this, arguments);
     }