@gearbox-protocol/sdk 8.19.2 → 8.19.4

package/dist/cjs/dev/AccountOpener.js

@@ -39,6 +39,8 @@ class OpenTxRevertedError extends import_viem.BaseError {
   }
 }
 class AccountOpener extends import_sdk.SDKConstruct {
+  borrowerKey;
+  depositorKey;
   #service;
   #anvil;
   #logger;
@@ -47,8 +49,15 @@ class AccountOpener extends import_sdk.SDKConstruct {
   #faucet;
   #poolDepositMultiplier;
   #minDebtMultiplier;
-  constructor(service, options = {}) {
+  constructor(service, options_ = {}) {
     super(service.sdk);
+    const {
+      borrowerKey,
+      depositorKey,
+      faucet,
+      poolDepositMultiplier = 30000n,
+      minDebtMultiplier = 10100n
+    } = options_;
     this.#service = service;
     this.#logger = (0, import_sdk.childLogger)("AccountOpener", service.sdk.logger);
     this.#anvil = (0, import_createAnvilClient.createAnvilClient)({
@@ -56,20 +65,26 @@ class AccountOpener extends import_sdk.SDKConstruct {
       transport: service.sdk.provider.transport
     });
     try {
-      this.#faucet = options.faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
+      this.#faucet = faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
     } catch (_e) {
       this.#logger?.warn("faucet not found, will not claim from faucet");
     }
-    this.#borrower = options.borrower;
-    this.#depositor = options.depositor;
-    this.#poolDepositMultiplier = options.poolDepositMultiplier ?? 11000n;
-    this.#minDebtMultiplier = options.minDebtMultiplier ?? 10100n;
+    this.borrowerKey = borrowerKey ?? (0, import_accounts.generatePrivateKey)();
+    this.depositorKey = depositorKey ?? (0, import_accounts.generatePrivateKey)();
+    this.#poolDepositMultiplier = BigInt(poolDepositMultiplier);
+    this.#minDebtMultiplier = BigInt(minDebtMultiplier);
   }
   get borrower() {
     if (!this.#borrower) {
       throw new Error("borrower can be used only after openCreditAccounts");
     }
-    return this.#borrower.address;
+    return this.#borrower;
+  }
+  get depositor() {
+    if (!this.#depositor) {
+      throw new Error("depositor can be used only after openCreditAccounts");
+    }
+    return this.#depositor;
   }
   /**
    * Tries to open account with underlying only in each CM
@@ -280,7 +295,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
   }
   async getOpenedAccounts() {
     return await this.#service.getCreditAccounts({
-      owner: this.borrower
+      owner: this.borrower.address
     });
   }
   async #depositIntoPools(targets) {
@@ -291,7 +306,8 @@ class AccountOpener extends import_sdk.SDKConstruct {
       const leverage = this.#getLeverage(t);
       const cm = this.sdk.marketRegister.findCreditManager(t.creditManager);
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / import_sdk.PERCENTAGE_FACTOR;
-      const amount = minDebt * (leverage - import_sdk.PERCENTAGE_FACTOR) / import_sdk.PERCENTAGE_FACTOR * this.#poolDepositMultiplier / import_sdk.PERCENTAGE_FACTOR;
+      let amount = minDebt * (leverage - import_sdk.PERCENTAGE_FACTOR) / import_sdk.PERCENTAGE_FACTOR * this.#poolDepositMultiplier / import_sdk.PERCENTAGE_FACTOR;
+      amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
       minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
       this.#logger?.debug(
         `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount)} ${this.sdk.tokensMeta.symbol(cm.underlying)} in pool (leverage: ${Number(leverage / import_sdk.PERCENTAGE_FACTOR)}%)`
@@ -321,8 +337,8 @@ class AccountOpener extends import_sdk.SDKConstruct {
     this.#logger?.debug(
       `total USD to claim from faucet: ${(0, import_sdk.formatBN)(totalUSD, 8)}`
     );
-    const depositor = this.#depositor ?? await this.#createAccount();
-    this.#logger?.debug(`created depositor ${depositor.address}`);
+    const depositor = await this.#getDepositor();
+    this.#logger?.debug(`depositor: ${depositor.address}`);
     await this.#claimFromFaucet(depositor, "depositor", totalUSD);
     const results = [];
     for (const [pool, amount] of deposits) {
@@ -537,13 +553,20 @@ class AccountOpener extends import_sdk.SDKConstruct {
   }
   async #getBorrower() {
     if (!this.#borrower) {
-      this.#borrower = await this.#createAccount();
+      this.#borrower = await this.#createAccount(this.borrowerKey);
       this.#logger?.info(`created borrower ${this.#borrower.address}`);
     }
-    return this.#borrower;
+    return this.borrower;
+  }
+  async #getDepositor() {
+    if (!this.#depositor) {
+      this.#depositor = await this.#createAccount(this.depositorKey);
+      this.#logger?.info(`created depositor ${this.#depositor.address}`);
+    }
+    return this.depositor;
   }
-  async #createAccount() {
-    const acc = (0, import_accounts.privateKeyToAccount)((0, import_accounts.generatePrivateKey)());
+  async #createAccount(privateKey) {
+    const acc = (0, import_accounts.privateKeyToAccount)(privateKey);
     await this.#anvil.setBalance({
       address: acc.address,
       value: (0, import_viem.parseEther)("100")
@@ -699,7 +722,8 @@ class AccountOpener extends import_sdk.SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const lt = BigInt(cm.creditManager.liquidationThresholds.mustGet(target));
     const d = 50n;
-    return import_sdk.PERCENTAGE_FACTOR * (1n + (lt - d) / (import_sdk.PERCENTAGE_FACTOR - lt));
+    const result = import_sdk.PERCENTAGE_FACTOR * (1n + (lt - d) / (import_sdk.PERCENTAGE_FACTOR - lt));
+    return result > import_sdk.PERCENTAGE_FACTOR * 10n ? import_sdk.PERCENTAGE_FACTOR * 10n : result;
   }
   get faucet() {
     if (!this.#faucet) {

package/dist/esm/dev/AccountOpener.js

@@ -31,6 +31,8 @@ class OpenTxRevertedError extends BaseError {
   }
 }
 class AccountOpener extends SDKConstruct {
+  borrowerKey;
+  depositorKey;
   #service;
   #anvil;
   #logger;
@@ -39,8 +41,15 @@ class AccountOpener extends SDKConstruct {
   #faucet;
   #poolDepositMultiplier;
   #minDebtMultiplier;
-  constructor(service, options = {}) {
+  constructor(service, options_ = {}) {
     super(service.sdk);
+    const {
+      borrowerKey,
+      depositorKey,
+      faucet,
+      poolDepositMultiplier = 30000n,
+      minDebtMultiplier = 10100n
+    } = options_;
     this.#service = service;
     this.#logger = childLogger("AccountOpener", service.sdk.logger);
     this.#anvil = createAnvilClient({
@@ -48,20 +57,26 @@ class AccountOpener extends SDKConstruct {
       transport: service.sdk.provider.transport
     });
     try {
-      this.#faucet = options.faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
+      this.#faucet = faucet ?? service.sdk.addressProvider.getAddress("FAUCET");
     } catch (_e) {
       this.#logger?.warn("faucet not found, will not claim from faucet");
     }
-    this.#borrower = options.borrower;
-    this.#depositor = options.depositor;
-    this.#poolDepositMultiplier = options.poolDepositMultiplier ?? 11000n;
-    this.#minDebtMultiplier = options.minDebtMultiplier ?? 10100n;
+    this.borrowerKey = borrowerKey ?? generatePrivateKey();
+    this.depositorKey = depositorKey ?? generatePrivateKey();
+    this.#poolDepositMultiplier = BigInt(poolDepositMultiplier);
+    this.#minDebtMultiplier = BigInt(minDebtMultiplier);
   }
   get borrower() {
     if (!this.#borrower) {
       throw new Error("borrower can be used only after openCreditAccounts");
     }
-    return this.#borrower.address;
+    return this.#borrower;
+  }
+  get depositor() {
+    if (!this.#depositor) {
+      throw new Error("depositor can be used only after openCreditAccounts");
+    }
+    return this.#depositor;
   }
   /**
    * Tries to open account with underlying only in each CM
@@ -272,7 +287,7 @@ class AccountOpener extends SDKConstruct {
   }
   async getOpenedAccounts() {
     return await this.#service.getCreditAccounts({
-      owner: this.borrower
+      owner: this.borrower.address
     });
   }
   async #depositIntoPools(targets) {
@@ -283,7 +298,8 @@ class AccountOpener extends SDKConstruct {
       const leverage = this.#getLeverage(t);
       const cm = this.sdk.marketRegister.findCreditManager(t.creditManager);
       const minDebt = this.#minDebtMultiplier * cm.creditFacade.minDebt / PERCENTAGE_FACTOR;
-      const amount = minDebt * (leverage - PERCENTAGE_FACTOR) / PERCENTAGE_FACTOR * this.#poolDepositMultiplier / PERCENTAGE_FACTOR;
+      let amount = minDebt * (leverage - PERCENTAGE_FACTOR) / PERCENTAGE_FACTOR * this.#poolDepositMultiplier / PERCENTAGE_FACTOR;
+      amount = amount > cm.creditFacade.maxDebt ? cm.creditFacade.maxDebt : amount;
       minAvailableByPool[cm.pool] = (minAvailableByPool[cm.pool] ?? 0n) + amount;
       this.#logger?.debug(
         `target #${i + 1} (${this.labelAddress(t.target)}) needs ${this.sdk.tokensMeta.formatBN(cm.underlying, amount)} ${this.sdk.tokensMeta.symbol(cm.underlying)} in pool (leverage: ${Number(leverage / PERCENTAGE_FACTOR)}%)`
@@ -313,8 +329,8 @@ class AccountOpener extends SDKConstruct {
     this.#logger?.debug(
       `total USD to claim from faucet: ${formatBN(totalUSD, 8)}`
     );
-    const depositor = this.#depositor ?? await this.#createAccount();
-    this.#logger?.debug(`created depositor ${depositor.address}`);
+    const depositor = await this.#getDepositor();
+    this.#logger?.debug(`depositor: ${depositor.address}`);
     await this.#claimFromFaucet(depositor, "depositor", totalUSD);
     const results = [];
     for (const [pool, amount] of deposits) {
@@ -529,13 +545,20 @@ class AccountOpener extends SDKConstruct {
   }
   async #getBorrower() {
     if (!this.#borrower) {
-      this.#borrower = await this.#createAccount();
+      this.#borrower = await this.#createAccount(this.borrowerKey);
       this.#logger?.info(`created borrower ${this.#borrower.address}`);
     }
-    return this.#borrower;
+    return this.borrower;
+  }
+  async #getDepositor() {
+    if (!this.#depositor) {
+      this.#depositor = await this.#createAccount(this.depositorKey);
+      this.#logger?.info(`created depositor ${this.#depositor.address}`);
+    }
+    return this.depositor;
   }
-  async #createAccount() {
-    const acc = privateKeyToAccount(generatePrivateKey());
+  async #createAccount(privateKey) {
+    const acc = privateKeyToAccount(privateKey);
     await this.#anvil.setBalance({
       address: acc.address,
       value: parseEther("100")
@@ -691,7 +714,8 @@ class AccountOpener extends SDKConstruct {
     const cm = this.sdk.marketRegister.findCreditManager(creditManager);
     const lt = BigInt(cm.creditManager.liquidationThresholds.mustGet(target));
     const d = 50n;
-    return PERCENTAGE_FACTOR * (1n + (lt - d) / (PERCENTAGE_FACTOR - lt));
+    const result = PERCENTAGE_FACTOR * (1n + (lt - d) / (PERCENTAGE_FACTOR - lt));
+    return result > PERCENTAGE_FACTOR * 10n ? PERCENTAGE_FACTOR * 10n : result;
   }
   get faucet() {
     if (!this.#faucet) {

package/dist/types/dev/AccountOpener.d.ts

@@ -8,10 +8,10 @@ export declare class OpenTxRevertedError extends BaseError {
 }
 export interface AccountOpenerOptions {
     faucet?: Address;
-    borrower?: PrivateKeyAccount;
-    depositor?: PrivateKeyAccount;
-    poolDepositMultiplier?: bigint;
-    minDebtMultiplier?: bigint;
+    borrowerKey?: Hex;
+    depositorKey?: Hex;
+    poolDepositMultiplier?: bigint | string | number;
+    minDebtMultiplier?: bigint | string | number;
 }
 export interface TargetAccount {
     creditManager: Address;
@@ -59,8 +59,11 @@ export interface OpenAccountsResult {
 }
 export declare class AccountOpener extends SDKConstruct {
     #private;
-    constructor(service: ICreditAccountsService, options?: AccountOpenerOptions);
-    get borrower(): Address;
+    readonly borrowerKey: Hex;
+    readonly depositorKey: Hex;
+    constructor(service: ICreditAccountsService, options_?: AccountOpenerOptions);
+    get borrower(): PrivateKeyAccount;
+    get depositor(): PrivateKeyAccount;
     /**
      * Tries to open account with underlying only in each CM
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "8.19.2",
+  "version": "8.19.4",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",