@gearbox-protocol/sdk 3.0.0-vfour.157 → 3.0.0-vfour.159

package/dist/cjs/dev/index.cjs

@@ -3,6 +3,7 @@
 var viem = require('viem');
 var accounts = require('viem/accounts');
 var sdk = require('../sdk');
+var constants = require('../sdk/constants');
 var promises = require('fs/promises');
 
 // src/dev/AccountOpener.ts
@@ -126,13 +127,32 @@ var AccountOpener = class {
       slippage,
       target: collateral
     });
-    logger?.debug("found open strategy");
+    logger?.debug(strategy, "found open strategy");
+    const debt = minDebt * BigInt(leverage - 1);
     const { tx, calls } = await this.#service.openCA({
       creditManager: cm.creditManager.address,
-      averageQuota: [],
-      minQuota: [],
+      averageQuota: [
+        {
+          token: collateral,
+          balance: this.#calcQuota(
+            strategy.amount,
+            debt,
+            BigInt(cm.collateralTokens[collateral])
+          )
+        }
+      ],
+      minQuota: [
+        {
+          token: collateral,
+          balance: this.#calcQuota(
+            strategy.minAmount,
+            debt,
+            BigInt(cm.collateralTokens[collateral])
+          )
+        }
+      ],
       collateral: [{ token: underlying, balance: minDebt }],
-      debt: minDebt * BigInt(leverage - 1),
+      debt,
       calls: strategy.calls,
       ethAmount: 0n,
       permits: {},
@@ -231,7 +251,21 @@ var AccountOpener = class {
   }
   async #approve(token, cm) {
     const borrower = await this.#getBorrower();
+    const symbol = this.#service.sdk.tokensMeta.symbol(token);
     try {
+      if (symbol === "USDT") {
+        const hash2 = await this.#anvil.writeContract({
+          account: borrower,
+          address: token,
+          abi: sdk.ierc20Abi,
+          functionName: "approve",
+          args: [cm.creditManager.address, 0n],
+          chain: this.#anvil.chain
+        });
+        await this.#anvil.waitForTransactionReceipt({
+          hash: hash2
+        });
+      }
       const hash = await this.#anvil.writeContract({
         account: borrower,
         address: token,
@@ -245,16 +279,16 @@ var AccountOpener = class {
       });
       if (receipt.status === "reverted") {
         this.#logger?.error(
-          `failed to allowed credit manager ${cm.creditManager.name} to spend ${token}, tx reverted: ${hash}`
+          `failed to allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}), tx reverted: ${hash}`
         );
       } else {
         this.#logger?.debug(
-          `allowed credit manager ${cm.creditManager.name} to spend ${token}, tx: ${hash}`
+          `allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}), tx: ${hash}`
         );
       }
     } catch (e) {
       this.#logger?.error(
-        `failed to allowed credit manager ${cm.creditManager.name} to spend ${token}: ${e}`
+        `failed to allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}): ${e}`
       );
     }
   }
@@ -317,6 +351,12 @@ var AccountOpener = class {
     }
     return this.#borrower;
   }
+  #calcQuota(amount, debt, lt) {
+    let quota = amount * lt / constants.PERCENTAGE_FACTOR;
+    quota = debt < quota ? debt : quota;
+    quota = quota * (constants.PERCENTAGE_FACTOR + 500n) / constants.PERCENTAGE_FACTOR;
+    return quota / constants.PERCENTAGE_FACTOR * constants.PERCENTAGE_FACTOR;
+  }
   get sdk() {
     return this.#service.sdk;
   }

package/dist/esm/dev/index.mjs

@@ -1,6 +1,7 @@
 import { createTestClient, publicActions, walletActions, toHex, isAddress, parseEther, createWalletClient, http, createPublicClient } from 'viem';
 import { privateKeyToAccount, generatePrivateKey } from 'viem/accounts';
-import { childLogger, sendRawTx, ADDRESS_0X0, formatBN, ierc20Abi, MAX_UINT256, iDegenNftv2Abi, PERCENTAGE_FACTOR, GearboxSDK, json_stringify, WAD } from '../sdk/index.mjs';
+import { childLogger, sendRawTx, ADDRESS_0X0, formatBN, ierc20Abi, MAX_UINT256, iDegenNftv2Abi, PERCENTAGE_FACTOR as PERCENTAGE_FACTOR$1, GearboxSDK, json_stringify, WAD } from '../sdk/index.mjs';
+import { PERCENTAGE_FACTOR } from '../sdk/constants';
 import { writeFile, readFile } from 'node:fs/promises';
 
 // src/dev/AccountOpener.ts
@@ -124,13 +125,32 @@ var AccountOpener = class {
       slippage,
       target: collateral
     });
-    logger?.debug("found open strategy");
+    logger?.debug(strategy, "found open strategy");
+    const debt = minDebt * BigInt(leverage - 1);
     const { tx, calls } = await this.#service.openCA({
       creditManager: cm.creditManager.address,
-      averageQuota: [],
-      minQuota: [],
+      averageQuota: [
+        {
+          token: collateral,
+          balance: this.#calcQuota(
+            strategy.amount,
+            debt,
+            BigInt(cm.collateralTokens[collateral])
+          )
+        }
+      ],
+      minQuota: [
+        {
+          token: collateral,
+          balance: this.#calcQuota(
+            strategy.minAmount,
+            debt,
+            BigInt(cm.collateralTokens[collateral])
+          )
+        }
+      ],
       collateral: [{ token: underlying, balance: minDebt }],
-      debt: minDebt * BigInt(leverage - 1),
+      debt,
       calls: strategy.calls,
       ethAmount: 0n,
       permits: {},
@@ -229,7 +249,21 @@ var AccountOpener = class {
   }
   async #approve(token, cm) {
     const borrower = await this.#getBorrower();
+    const symbol = this.#service.sdk.tokensMeta.symbol(token);
     try {
+      if (symbol === "USDT") {
+        const hash2 = await this.#anvil.writeContract({
+          account: borrower,
+          address: token,
+          abi: ierc20Abi,
+          functionName: "approve",
+          args: [cm.creditManager.address, 0n],
+          chain: this.#anvil.chain
+        });
+        await this.#anvil.waitForTransactionReceipt({
+          hash: hash2
+        });
+      }
       const hash = await this.#anvil.writeContract({
         account: borrower,
         address: token,
@@ -243,16 +277,16 @@ var AccountOpener = class {
       });
       if (receipt.status === "reverted") {
         this.#logger?.error(
-          `failed to allowed credit manager ${cm.creditManager.name} to spend ${token}, tx reverted: ${hash}`
+          `failed to allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}), tx reverted: ${hash}`
         );
       } else {
         this.#logger?.debug(
-          `allowed credit manager ${cm.creditManager.name} to spend ${token}, tx: ${hash}`
+          `allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}), tx: ${hash}`
         );
       }
     } catch (e) {
       this.#logger?.error(
-        `failed to allowed credit manager ${cm.creditManager.name} to spend ${token}: ${e}`
+        `failed to allowed credit manager ${cm.creditManager.name} to spend ${symbol} (${token}): ${e}`
       );
     }
   }
@@ -315,6 +349,12 @@ var AccountOpener = class {
     }
     return this.#borrower;
   }
+  #calcQuota(amount, debt, lt) {
+    let quota = amount * lt / PERCENTAGE_FACTOR;
+    quota = debt < quota ? debt : quota;
+    quota = quota * (PERCENTAGE_FACTOR + 500n) / PERCENTAGE_FACTOR;
+    return quota / PERCENTAGE_FACTOR * PERCENTAGE_FACTOR;
+  }
   get sdk() {
     return this.#service.sdk;
   }
@@ -328,7 +368,7 @@ async function calcLiquidatableLTs(sdk, ca, factor = 9990n, logger) {
     const lt = BigInt(cm.collateralTokens[token]);
     return {
       token,
-      weightedBalance: balanceU * lt / PERCENTAGE_FACTOR,
+      weightedBalance: balanceU * lt / PERCENTAGE_FACTOR$1,
       lt
     };
   }).sort((a, b) => {
@@ -337,7 +377,7 @@ async function calcLiquidatableLTs(sdk, ca, factor = 9990n, logger) {
     return b.weightedBalance > a.weightedBalance ? 1 : -1;
   });
   let divisor = 0n;
-  let dividend = factor * (ca.debt + ca.accruedInterest + ca.accruedFees) / PERCENTAGE_FACTOR;
+  let dividend = factor * (ca.debt + ca.accruedInterest + ca.accruedFees) / PERCENTAGE_FACTOR$1;
   for (const { token, weightedBalance } of weightedBalances) {
     if (token === ca.underlying) {
       dividend -= weightedBalance;
@@ -1900,7 +1940,7 @@ async function setLTZero(anvil, cm, logger) {
     args: [
       cm.feeInterest,
       cm.liquidationDiscount - 1,
-      Number(PERCENTAGE_FACTOR) - cm.liquidationDiscount,
+      Number(PERCENTAGE_FACTOR$1) - cm.liquidationDiscount,
       cm.feeLiquidationExpired,
       cm.liquidationDiscountExpired
     ]
@@ -1916,7 +1956,7 @@ async function setLTZero(anvil, cm, logger) {
     args: [
       cm.feeInterest,
       cm.feeLiquidation,
-      Number(PERCENTAGE_FACTOR) - cm.liquidationDiscount,
+      Number(PERCENTAGE_FACTOR$1) - cm.liquidationDiscount,
       cm.feeLiquidationExpired,
       cm.liquidationDiscountExpired
     ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-vfour.157",
+  "version": "3.0.0-vfour.159",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.cjs",