@enzymefinance/testutils 4.0.1 → 4.0.2

package/dist/index.d.ts

@@ -538,11 +538,11 @@ declare function convexVotingPositionWithdraw({ comptrollerProxy, externalPositi
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: ethers.BytesLike], void, ComptrollerLib>>>;
 
 interface ILiquityTroveManager extends Contract<ILiquityTroveManager> {
-    getBorrowingFee: Call<(_LUSDDebt: BigNumberish) => BigNumberish>;
+    getBorrowingFee: Call<(_LUSDDebt: BigNumberish) => BigNumber>;
 }
 declare const ILiquityTroveManager: _enzymefinance_ethers.ContractFactory<ILiquityTroveManager, never>;
 interface ILiquityHintHelper extends Contract<ILiquityHintHelper> {
-    getApproxHint: Call<(_cr: BigNumberish, _numTrials: BigNumberish, _inputRandomSeed: BigNumberish) => [hintAddress_: AddressLike, diff_: BigNumberish, latestRandomSeed_: BigNumberish]>;
+    getApproxHint: Call<(_cr: BigNumberish, _numTrials: BigNumberish, _inputRandomSeed: BigNumberish) => [hintAddress_: AddressLike, diff_: BigNumber, latestRandomSeed_: BigNumber]>;
 }
 declare const ILiquityHintHelper: _enzymefinance_ethers.ContractFactory<ILiquityHintHelper, never>;
 interface ILiquitySortedTroves extends Contract<ILiquitySortedTroves> {
@@ -557,31 +557,36 @@ declare function createLiquityDebtPosition({ signer, comptrollerProxy, externalP
     externalPositionProxy: _enzymefinance_protocol.IExternalPositionProxy;
     receipt: _enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>;
 }>;
-declare function liquityCalcHints({ collateralAmount, lusdAmount, numTrials, liquitySortedTroves, liquityHintHelper, inputRandomSeed, }: {
+declare function liquityCalcHints({ collateralAmount, debtAmount, // Total debt, inclusive of fees
+numTrials, // See note above for recommended value. This helper uses a static value for testing purposes.
+liquitySortedTroves, liquityHintHelper, inputRandomSeed, }: {
     collateralAmount: BigNumber;
-    lusdAmount: BigNumber;
+    debtAmount: BigNumber;
     numTrials?: BigNumber;
     liquitySortedTroves: ILiquitySortedTroves;
     liquityHintHelper: ILiquityHintHelper;
     inputRandomSeed?: BigNumber;
-}): Promise<[prevId_: AddressLike, nextId_: AddressLike]>;
-declare function liquityDebtPositionAddCollateral({ comptrollerProxy, externalPositionManager, signer, collateralAmount, lowerHint, upperHint, externalPositionProxy, }: {
+}): Promise<{
+    lowerHint: AddressLike;
+    upperHint: AddressLike;
+}>;
+declare function liquityDebtPositionAddCollateral({ comptrollerProxy, externalPositionManager, signer, collateralAmount, upperHint, lowerHint, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     signer: SignerWithAddress;
     collateralAmount: BigNumberish;
-    lowerHint: AddressLike;
     upperHint: AddressLike;
+    lowerHint: AddressLike;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
-declare function liquityDebtPositionBorrow({ comptrollerProxy, externalPositionManager, signer, maxFeePercentage, lusdAmount, lowerHint, upperHint, externalPositionProxy, }: {
+declare function liquityDebtPositionBorrow({ comptrollerProxy, externalPositionManager, signer, maxFeePercentage, lusdAmount, upperHint, lowerHint, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     signer: SignerWithAddress;
     maxFeePercentage: BigNumberish;
     lusdAmount: BigNumberish;
-    lowerHint: AddressLike;
     upperHint: AddressLike;
+    lowerHint: AddressLike;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
 declare function liquityDebtPositionCloseTrove({ comptrollerProxy, externalPositionManager, signer, externalPositionProxy, }: {
@@ -590,33 +595,33 @@ declare function liquityDebtPositionCloseTrove({ comptrollerProxy, externalPosit
     signer: SignerWithAddress;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
-declare function liquityDebtPositionOpenTrove({ comptrollerProxy, externalPositionManager, signer, maxFeePercentage, collateralAmount, lusdAmount, lowerHint, upperHint, externalPositionProxy, }: {
+declare function liquityDebtPositionOpenTrove({ comptrollerProxy, externalPositionManager, signer, maxFeePercentage, collateralAmount, lusdAmount, upperHint, lowerHint, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     signer: SignerWithAddress;
     maxFeePercentage: BigNumberish;
     collateralAmount: BigNumberish;
     lusdAmount: BigNumberish;
-    lowerHint: AddressLike;
     upperHint: AddressLike;
+    lowerHint: AddressLike;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
-declare function liquityDebtPositionRemoveCollateral({ comptrollerProxy, externalPositionManager, signer, collateralAmount, lowerHint, upperHint, externalPositionProxy, }: {
+declare function liquityDebtPositionRemoveCollateral({ comptrollerProxy, externalPositionManager, signer, collateralAmount, upperHint, lowerHint, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     signer: SignerWithAddress;
     collateralAmount: BigNumberish;
-    lowerHint: AddressLike;
     upperHint: AddressLike;
+    lowerHint: AddressLike;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
-declare function liquityDebtPositionRepay({ comptrollerProxy, externalPositionManager, signer, lusdAmount, lowerHint, upperHint, externalPositionProxy, }: {
+declare function liquityDebtPositionRepay({ comptrollerProxy, externalPositionManager, signer, lusdAmount, upperHint, lowerHint, externalPositionProxy, }: {
     comptrollerProxy: ComptrollerLib;
     externalPositionManager: ExternalPositionManager;
     signer: SignerWithAddress;
     lusdAmount: BigNumberish;
-    lowerHint: AddressLike;
     upperHint: AddressLike;
+    lowerHint: AddressLike;
     externalPositionProxy: AddressLike;
 }): Promise<_enzymefinance_ethers.ContractReceipt<_enzymefinance_ethers.SendFunction<[_extension: AddressLike, _actionId: BigNumberish, _callArgs: utils.BytesLike], void, ComptrollerLib>>>;
 

package/dist/index.js

@@ -938,24 +938,24 @@ async function createLiquityDebtPosition({
 }
 async function liquityCalcHints({
   collateralAmount,
-  lusdAmount,
-  numTrials = _ethers3.BigNumber.from("15"),
+  debtAmount,
+  numTrials = _ethers3.BigNumber.from("100"),
   liquitySortedTroves,
   liquityHintHelper,
   inputRandomSeed = _ethers3.BigNumber.from("4")
 }) {
-  const nicr = collateralAmount.mul(_ethers3.utils.parseEther("100")).div(lusdAmount);
+  const nicr = collateralAmount.mul(_ethers3.utils.parseEther("100")).div(debtAmount);
   const approxHint = await liquityHintHelper.getApproxHint.args(nicr, numTrials, inputRandomSeed).call();
-  const hints = await liquitySortedTroves.findInsertPosition.args(nicr, approxHint[0], approxHint[0]).call();
-  return hints;
+  const [upperHint, lowerHint] = await liquitySortedTroves.findInsertPosition.args(nicr, approxHint[0], approxHint[0]).call();
+  return { lowerHint, upperHint };
 }
 async function liquityDebtPositionAddCollateral({
   comptrollerProxy,
   externalPositionManager,
   signer,
   collateralAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = _protocol.liquityDebtPositionAddCollateralArgs.call(void 0, {
@@ -978,8 +978,8 @@ async function liquityDebtPositionBorrow({
   signer,
   maxFeePercentage,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = _protocol.liquityDebtPositionBorrowArgs.call(void 0, {
@@ -1020,8 +1020,8 @@ async function liquityDebtPositionOpenTrove({
   maxFeePercentage,
   collateralAmount,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = _protocol.liquityDebtPositionOpenTroveArgs.call(void 0, {
@@ -1045,8 +1045,8 @@ async function liquityDebtPositionRemoveCollateral({
   externalPositionManager,
   signer,
   collateralAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = _protocol.liquityDebtPositionRemoveCollateralArgs.call(void 0, {
@@ -1068,8 +1068,8 @@ async function liquityDebtPositionRepay({
   externalPositionManager,
   signer,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = _protocol.liquityDebtPositionRepayBorrowArgs.call(void 0, {

package/dist/index.mjs

@@ -938,24 +938,24 @@ async function createLiquityDebtPosition({
 }
 async function liquityCalcHints({
   collateralAmount,
-  lusdAmount,
-  numTrials = BigNumber4.from("15"),
+  debtAmount,
+  numTrials = BigNumber4.from("100"),
   liquitySortedTroves,
   liquityHintHelper,
   inputRandomSeed = BigNumber4.from("4")
 }) {
-  const nicr = collateralAmount.mul(utils4.parseEther("100")).div(lusdAmount);
+  const nicr = collateralAmount.mul(utils4.parseEther("100")).div(debtAmount);
   const approxHint = await liquityHintHelper.getApproxHint.args(nicr, numTrials, inputRandomSeed).call();
-  const hints = await liquitySortedTroves.findInsertPosition.args(nicr, approxHint[0], approxHint[0]).call();
-  return hints;
+  const [upperHint, lowerHint] = await liquitySortedTroves.findInsertPosition.args(nicr, approxHint[0], approxHint[0]).call();
+  return { lowerHint, upperHint };
 }
 async function liquityDebtPositionAddCollateral({
   comptrollerProxy,
   externalPositionManager,
   signer,
   collateralAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = liquityDebtPositionAddCollateralArgs({
@@ -978,8 +978,8 @@ async function liquityDebtPositionBorrow({
   signer,
   maxFeePercentage,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = liquityDebtPositionBorrowArgs({
@@ -1020,8 +1020,8 @@ async function liquityDebtPositionOpenTrove({
   maxFeePercentage,
   collateralAmount,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = liquityDebtPositionOpenTroveArgs({
@@ -1045,8 +1045,8 @@ async function liquityDebtPositionRemoveCollateral({
   externalPositionManager,
   signer,
   collateralAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = liquityDebtPositionRemoveCollateralArgs({
@@ -1068,8 +1068,8 @@ async function liquityDebtPositionRepay({
   externalPositionManager,
   signer,
   lusdAmount,
-  lowerHint,
   upperHint,
+  lowerHint,
   externalPositionProxy
 }) {
   const actionArgs = liquityDebtPositionRepayBorrowArgs({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enzymefinance/testutils",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Technology Regulated and Operated Investment Funds",
   "author": "Enzyme Council DAO <council@enzyme.finance>",
   "license": "GPL-3.0",
@@ -45,9 +45,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@enzymefinance/ethers": "^4.0.1",
-    "@enzymefinance/hardhat": "^4.0.1",
-    "@enzymefinance/protocol": "^4.0.1",
+    "@enzymefinance/ethers": "^4.0.2",
+    "@enzymefinance/hardhat": "^4.0.2",
+    "@enzymefinance/protocol": "^4.0.2",
     "ethers": "^5.6.2",
     "merkletreejs": "^0.2.31"
   },