@gearbox-protocol/deploy-tools 5.3.26 → 5.3.28

package/dist/index.mjs

@@ -375989,7 +375989,7 @@ var PoolQuotaKeeperContract = class extends BaseContract {
       quotas: this.quotas.entries().reduce(
         (acc, [address, params]) => ({
           ...acc,
-          [address]: {
+          [this.labelAddress(address)]: {
             rate: percentFmt(params.rate, raw),
             quotaIncreaseFee: percentFmt(params.quotaIncreaseFee, raw),
             totalQuoted: formatBNvalue(
@@ -376023,7 +376023,7 @@ var PoolQuotaKeeperContract = class extends BaseContract {
     }
   }
 };
-var PoolFactory = class extends SDKConstruct {
+var PoolSuite = class extends SDKConstruct {
   pool;
   pqk;
   gauge;
@@ -383422,16 +383422,10 @@ var PriceOracleBaseContract = class extends BaseContract {
     return {
       ...super.stateHuman(raw),
       mainPriceFeeds: Object.fromEntries(
-        this.mainPriceFeeds.entries().map(([token, v]) => [
-          this.labelAddress(token),
-          v.stateHuman(raw)
-        ])
+        this.mainPriceFeeds.entries().map(([token, v]) => [this.labelAddress(token), v.stateHuman(raw)])
       ),
       reservePriceFeeds: Object.fromEntries(
-        this.reservePriceFeeds.entries().map(([token, v]) => [
-          this.labelAddress(token),
-          v.stateHuman(raw)
-        ])
+        this.reservePriceFeeds.entries().map(([token, v]) => [this.labelAddress(token), v.stateHuman(raw)])
       )
     };
   }
@@ -383512,7 +383506,7 @@ var PriceOracleV310Contract = class extends PriceOracleBaseContract {
 var MarketSuite = class extends SDKConstruct {
   acl;
   configurator;
-  poolFactory;
+  pool;
   priceOracle;
   creditManagers = [];
   /**
@@ -383542,7 +383536,7 @@ var MarketSuite = class extends SDKConstruct {
       sdk.tokensMeta.upsert(t.addr, t);
       sdk.provider.addressLabels.set(t.addr, t.symbol);
     }
-    this.poolFactory = new PoolFactory(sdk, marketData);
+    this.pool = new PoolSuite(sdk, marketData);
     this.zappers = marketData.zappers;
     for (let i = 0; i < marketData.creditManagers.length; i++) {
       this.creditManagers.push(new CreditSuite(sdk, marketData, i));
@@ -383562,11 +383556,11 @@ var MarketSuite = class extends SDKConstruct {
     }
   }
   get dirty() {
-    return this.configurator.dirty || this.poolFactory.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
+    return this.configurator.dirty || this.pool.dirty || this.priceOracle.dirty || this.creditManagers.some((cm) => cm.dirty);
   }
   stateHuman(raw = true) {
     return {
-      pool: this.poolFactory.stateHuman(raw),
+      pool: this.pool.stateHuman(raw),
       creditManagers: this.creditManagers.map((cm) => cm.stateHuman(raw)),
       priceOracle: this.priceOracle.stateHuman(raw),
       pausableAdmins: this.state.pausableAdmins.map((a) => this.labelAddress(a)),
@@ -383612,7 +383606,7 @@ var MarketRegister = class extends SDKConstruct {
     await this.#loadMarkets(marketConfigurators, [], ignoreUpdateablePrices);
   }
   async syncState() {
-    const pools = this.markets.filter((m) => m.dirty).map((m) => m.poolFactory.pool.address);
+    const pools = this.markets.filter((m) => m.dirty).map((m) => m.pool.pool.address);
     if (pools.length) {
       this.#logger?.debug(`need to reload ${pools.length} markets`);
       await this.#loadMarkets([], pools);
@@ -383697,7 +383691,7 @@ var MarketRegister = class extends SDKConstruct {
     return this.markets.map((market) => market.stateHuman(raw));
   }
   get pools() {
-    return this.markets.map((market) => market.poolFactory);
+    return this.markets.map((market) => market.pool);
   }
   get creditManagers() {
     return this.markets.flatMap((market) => market.creditManagers);
@@ -384592,8 +384586,8 @@ var CreditAccountsService = class extends SDKConstruct {
       to,
       calls: openPathCalls
     } = props;
-    const cmFactory = this.sdk.marketRegister.findCreditManager(creditManager);
-    const cm = cmFactory.creditManager;
+    const cmSuite = this.sdk.marketRegister.findCreditManager(creditManager);
+    const cm = cmSuite.creditManager;
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade(
       cm.address,
       void 0,
@@ -384607,13 +384601,9 @@ var CreditAccountsService = class extends SDKConstruct {
       ...openPathCalls,
       ...withdrawDebt ? [this.#prepareWithdrawToken(cm.creditFacade, cm.underlying, debt, to)] : []
     ];
-    const tx = cmFactory.creditFacade.openCreditAccount(
-      to,
-      calls,
-      referralCode
-    );
+    const tx = cmSuite.creditFacade.openCreditAccount(to, calls, referralCode);
     tx.value = ethAmount.toString(10);
-    return { calls, tx, creditFacade: cmFactory.creditFacade };
+    return { calls, tx, creditFacade: cmSuite.creditFacade };
   }
   /**
    * Internal wrapper for CreditAccountCompressor.getCreditAccounts + price updates wrapped into multicall
@@ -384664,7 +384654,7 @@ var CreditAccountsService = class extends SDKConstruct {
       const market = this.sdk.marketRegister.findByCreditManager(
         acc.creditManager
       );
-      const pool = market.poolFactory.pool.address;
+      const pool = market.pool.pool.address;
       oracleByPool.set(pool, market.priceOracle);
       for (const t of acc.tokens) {
         if (t.balance > 10n) {
@@ -384675,9 +384665,9 @@ var CreditAccountsService = class extends SDKConstruct {
       }
     }
     const priceFeeds = [];
-    for (const [pool, priceFeedFactory] of oracleByPool.entries()) {
+    for (const [pool, oracle] of oracleByPool.entries()) {
       const tokens = Array.from(tokensByPool.get(pool) ?? []);
-      priceFeeds.push(...priceFeedFactory.priceFeedsForTokens(tokens));
+      priceFeeds.push(...oracle.priceFeedsForTokens(tokens));
     }
     return this.sdk.priceFeeds.generatePriceFeedsUpdateTxs(priceFeeds);
   }
@@ -384688,7 +384678,7 @@ var CreditAccountsService = class extends SDKConstruct {
     const caBalancesRecord = creditAccount ? assetsMap(creditAccount.tokens) : creditAccount;
     const market = this.sdk.marketRegister.findByCreditManager(creditManager);
     const cm = this.sdk.marketRegister.findCreditManager(creditManager).creditManager;
-    const pool = market.poolFactory.pool.address;
+    const pool = market.pool.pool.address;
     oracleByPool.set(pool, market.priceOracle);
     const insertToken = (p, t) => {
       const tokens = tokensByPool.get(p) ?? /* @__PURE__ */ new Set();
@@ -409455,13 +409445,14 @@ async function evmMineDetailed(client, timestamp) {
     return void 0;
   }
 }
-var AccountOpener = class {
+var AccountOpener = class extends SDKConstruct {
   #service;
   #anvil;
   #logger;
   #borrower;
   #faucet;
   constructor(service, options = {}) {
+    super(service.sdk);
     this.#service = service;
     this.#logger = childLogger("AccountOpener", service.sdk.logger);
     this.#anvil = createAnvilClient({
@@ -409539,22 +409530,23 @@ var AccountOpener = class {
     });
     logger2?.debug(strategy, "found open strategy");
     const debt = minDebt * BigInt(leverage - 1);
-    const collateralLT = BigInt(cm.collateralTokens[collateral]);
-    const inUnderlying = collateral.toLowerCase() === underlying.toLowerCase();
+    const averageQuota = this.#getCollateralQuota(
+      cm,
+      collateral,
+      strategy.amount,
+      debt
+    );
+    const minQuota = this.#getCollateralQuota(
+      cm,
+      collateral,
+      strategy.minAmount,
+      debt
+    );
+    logger2?.debug({ averageQuota, minQuota }, "calculated quotas");
     const { tx, calls } = await this.#service.openCA({
       creditManager: cm.creditManager.address,
-      averageQuota: inUnderlying ? [] : [
-        {
-          token: collateral,
-          balance: this.#calcQuota(strategy.amount, debt, collateralLT)
-        }
-      ],
-      minQuota: inUnderlying ? [] : [
-        {
-          token: collateral,
-          balance: this.#calcQuota(strategy.minAmount, debt, collateralLT)
-        }
-      ],
+      averageQuota,
+      minQuota,
       collateral: [{ token: underlying, balance: minDebt }],
       debt,
       calls: strategy.calls,
@@ -409749,15 +409741,37 @@ var AccountOpener = class {
     }
     return this.#borrower;
   }
+  #getCollateralQuota(cm, collateral, amount, debt) {
+    const { underlying, collateralTokens } = cm;
+    const inUnderlying = collateral.toLowerCase() === underlying.toLowerCase();
+    if (inUnderlying) {
+      return [];
+    }
+    const collateralLT = BigInt(collateralTokens[collateral]);
+    const market = this.sdk.marketRegister.findByCreditManager(
+      cm.creditManager.address
+    );
+    const quotaInfo = market.pool.pqk.quotas.mustGet(collateral);
+    const availableQuota = quotaInfo.limit - quotaInfo.totalQuoted;
+    if (availableQuota <= 0n) {
+      throw new Error(
+        `quota exceeded for asset ${this.labelAddress(collateral)} in ${cm.name}`
+      );
+    }
+    const desiredQuota = this.#calcQuota(amount, debt, collateralLT);
+    return [
+      {
+        token: collateral,
+        balance: desiredQuota < availableQuota ? desiredQuota : availableQuota
+      }
+    ];
+  }
   #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;
-  }
 };
 var SDKExample = class {
   #sdk;
@@ -418122,6 +418136,11 @@ function openAccounts() {
         "stateAfter.human.json"
       )
     });
+    await writeFile5(
+      path8.resolve(sharedDir, "deploy-state", "stateAfter.json"),
+      json_stringify(sdkExample2.sdk.state),
+      "utf-8"
+    );
     const faucetAddr = await sdkExample2.sdk.provider.publicClient.readContract({
       address: ADDRESS_PROVIDER[sdkExample2.sdk.provider.networkType],
       abi: iAddressProviderV3_1Abi,
@@ -418239,7 +418258,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.3.26",
+  version: "5.3.28",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -418282,7 +418301,7 @@ var package_default = {
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "^3.0.0-vfour.172",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.174",
     "@gearbox-protocol/sdk-gov": "^2.33.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.3.26",
+  "version": "5.3.28",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"
@@ -44,7 +44,7 @@
     "@gearbox-protocol/deploy-tools-node": "0.0.0",
     "@gearbox-protocol/deploy-tools-shared": "0.0.0",
     "@gearbox-protocol/deploy-tools-types": "0.0.0",
-    "@gearbox-protocol/sdk": "^3.0.0-vfour.172",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.174",
     "@gearbox-protocol/sdk-gov": "^2.33.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.6",