@gearbox-protocol/deploy-tools 5.2.0 → 5.2.2

package/dist/index.mjs

@@ -361571,13 +361571,18 @@ var PriceFeedRegister = class extends SDKConstruct {
       AP_MARKET_COMPRESSOR,
       310
     );
+    const configurators = marketConfigurators ?? this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address);
+    this.logger?.debug(
+      { configurators, pools },
+      "calling getUpdatablePriceFeeds"
+    );
     const result = await this.provider.publicClient.readContract({
       address: marketCompressorAddress,
       abi: iMarketCompressorAbi,
       functionName: "getUpdatablePriceFeeds",
       args: [
         {
-          configurators: marketConfigurators ?? this.sdk.marketRegister.marketConfigurators.map((mc) => mc.address),
+          configurators,
           pools: pools ?? [],
           underlying: ADDRESS_0X0
         }
@@ -362296,7 +362301,7 @@ var MarketRegister = class extends SDKConstruct {
       await this.#loadMarkets([], pools);
     }
   }
-  async #loadMarkets(marketConfigurators, pools, ignoreUpdateablePrices) {
+  async #loadMarkets(configurators, pools, ignoreUpdateablePrices) {
     const marketCompressorAddress = this.sdk.addressProvider.getAddress(
       AP_MARKET_COMPRESSOR,
       310
@@ -362304,12 +362309,13 @@ var MarketRegister = class extends SDKConstruct {
     let txs = [];
     if (!ignoreUpdateablePrices) {
       await this.sdk.priceFeeds.preloadUpdatablePriceFeeds(
-        marketConfigurators,
+        configurators,
         pools
       );
       const updates = await this.sdk.priceFeeds.generatePriceFeedsUpdateTxs();
       txs = updates.txs;
     }
+    this.#logger?.debug({ configurators, pools }, "calling getMarkets");
     const resp = await simulateMulticall(this.provider.publicClient, {
       contracts: [
         ...txs.map(rawTxToMulticallPriceUpdate),
@@ -362319,7 +362325,7 @@ var MarketRegister = class extends SDKConstruct {
           functionName: "getMarkets",
           args: [
             {
-              configurators: marketConfigurators,
+              configurators,
               pools,
               underlying: ADDRESS_0X0
             }
@@ -363865,7 +363871,7 @@ var GearboxSDK = class _GearboxSDK {
       networkType
     });
     logger2?.debug(
-      { networkType, chainId, addressProvider },
+      { networkType, chainId, addressProvider, marketConfigurators },
       "attaching gearbox sdk"
     );
     return new _GearboxSDK({
@@ -382244,7 +382250,7 @@ var container = new Container();
 
 // ../../packages/node/dist/EtherscanVerifier.js
 import { mkdirSync as mkdirSync2 } from "node:fs";
-import { readFile as readFile4, writeFile as writeFile2 } from "node:fs/promises";
+import { readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
 import path4 from "node:path";
 
 // ../../packages/shared/dist/etherscan.js
@@ -388267,7 +388273,7 @@ async function pRetry(input, options) {
 }
 
 // ../../packages/node/dist/ProviderBase.js
-import { readFile as readFile3 } from "node:fs/promises";
+import { readFile as readFile4 } from "node:fs/promises";
 import { setTimeout as setTimeout2 } from "node:timers/promises";
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/dev/index.mjs
@@ -388414,6 +388420,7 @@ function privateKeyToAccount(privateKey, options = {}) {
 }
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/dev/index.mjs
+import { writeFile as writeFile2, readFile as readFile3 } from "node:fs/promises";
 function createAnvilClient({
   chain,
   transport
@@ -388727,6 +388734,94 @@ var AccountOpener = class {
     return this.#service.sdk;
   }
 };
+var SDKExample = class {
+  #sdk;
+  #logger;
+  constructor(logger2) {
+    this.#logger = logger2;
+  }
+  async run(opts) {
+    const {
+      addressProvider: ap,
+      addressProviderJson,
+      marketConfigurator: mc,
+      marketConfiguratorJson,
+      anvilUrl = "http://127.0.0.1:8545",
+      outFile
+    } = opts;
+    const addressProvider = await this.#readConfigAddress(
+      "addressProvider",
+      ap,
+      addressProviderJson
+    );
+    const marketConfigurator = await this.#readConfigAddress(
+      "marketConfigurator",
+      mc,
+      marketConfiguratorJson
+    );
+    this.#sdk = await GearboxSDK.attach({
+      rpcURLs: [anvilUrl],
+      timeout: 48e4,
+      addressProvider,
+      logger: this.#logger,
+      ignoreUpdateablePrices: true,
+      marketConfigurators: [marketConfigurator]
+    });
+    const puTx = await this.#sdk.priceFeeds.getUpdatePriceFeedsTx([
+      marketConfigurator
+    ]);
+    const updater = createWalletClient({
+      account: privateKeyToAccount(
+        "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+        // well-known anvil private key
+      ),
+      transport: http(anvilUrl)
+    });
+    const publicClient = createPublicClient({
+      transport: http(anvilUrl)
+    });
+    const hash2 = await sendRawTx(updater, { tx: puTx });
+    await publicClient.waitForTransactionReceipt({ hash: hash2 });
+    await this.#sdk.marketRegister.loadMarkets([marketConfigurator], true);
+    this.#logger?.info("attached sdk");
+    if (outFile) {
+      try {
+        await writeFile2(
+          outFile,
+          json_stringify(this.#sdk.stateHuman()),
+          "utf-8"
+        );
+      } catch (e) {
+        this.#logger?.error(`failed to write to ${outFile}: ${e}`);
+      }
+    }
+  }
+  async #readConfigAddress(name, value, file) {
+    let result = value;
+    if (!result) {
+      if (!file) {
+        throw new Error(`${name} is not specified`);
+      }
+      this.#logger?.debug(`reading ${name} json ${file}`);
+      const apFile = await readFile3(file, "utf-8").then(JSON.parse);
+      result = apFile[name];
+    }
+    if (!result) {
+      throw new Error(`${name} is not specified`);
+    }
+    if (!isAddress(result)) {
+      throw new Error(`${name} is not a valid address: ${result}`);
+    }
+    this.#logger?.info(`using ${name} ${result}`);
+    return result;
+  }
+  get sdk() {
+    if (!this.#sdk) {
+      throw new Error("sdk is not attached");
+    }
+    return this.#sdk;
+  }
+};
 var iaclAbi2 = [
   {
     type: "function",
@@ -390242,7 +390337,7 @@ var ProviderBase = class {
     if (this.#options.addressProviderJson) {
       try {
         this.logger.debug(`reading address provider json ${this.#options.addressProviderJson}`);
-        const gov = await readFile3(this.#options.addressProviderJson, "utf-8").then(JSON.parse);
+        const gov = await readFile4(this.#options.addressProviderJson, "utf-8").then(JSON.parse);
         if (gov.network !== this.#network) {
           throw new NetworkMismatchError(this.#network, gov.network);
         }
@@ -390261,7 +390356,7 @@ var ProviderBase = class {
     if (this.#options.governanceJson) {
       try {
         this.logger.debug(`reading governance json ${this.#options.governanceJson}`);
-        const gov = await readFile3(this.#options.governanceJson, "utf-8").then(JSON.parse);
+        const gov = await readFile4(this.#options.governanceJson, "utf-8").then(JSON.parse);
         if (gov.network !== this.#network) {
           throw new NetworkMismatchError(this.#network, gov.network);
         }
@@ -390438,7 +390533,7 @@ var EtherscanVerifier = class extends ProviderBase {
   async #getCached(address) {
     try {
       const cacheFile = path4.resolve(this.cacheDir, `${address.toLowerCase()}.json`);
-      const content = await readFile4(cacheFile, "utf8");
+      const content = await readFile5(cacheFile, "utf8");
       const resp = json_parse(content);
       this.#logger.trace(`cache hit for ${address}`);
       return resp;
@@ -390451,7 +390546,7 @@ var EtherscanVerifier = class extends ProviderBase {
   }
   async #saveCached(address, result) {
     const cacheFile = path4.resolve(this.cacheDir, `${address.toLowerCase()}.json`);
-    await writeFile2(cacheFile, json_stringify(result));
+    await writeFile3(cacheFile, json_stringify(result));
   }
   async #fetch(address) {
     const url = `${this.etherscanBase}/api?module=contract&action=getsourcecode&address=${address}&apikey=${this.etherscanApiKey}`;
@@ -390487,7 +390582,7 @@ var EtherscanVerifier = class extends ProviderBase {
 
 // ../../packages/node/dist/tree/GearboxAddressTree.js
 import { mkdirSync as mkdirSync3 } from "node:fs";
-import { readFile as readFile5, writeFile as writeFile3 } from "node:fs/promises";
+import { readFile as readFile6, writeFile as writeFile4 } from "node:fs/promises";
 import path5 from "node:path";
 
 // ../../packages/types/dist/addresses.js
@@ -392834,7 +392929,7 @@ var GearboxAddressTree = class _GearboxAddressTree extends ProviderBase {
       return [];
     }
     try {
-      const content = await readFile5(this.outFile, "utf-8").then(json_parse);
+      const content = await readFile6(this.outFile, "utf-8").then(json_parse);
       if (content.version !== _GearboxAddressTree.version) {
         this.logger.warn(`ignoring cache file because it has version ${content.version}, but we need ${_GearboxAddressTree.version}`);
         return [];
@@ -392859,7 +392954,7 @@ var GearboxAddressTree = class _GearboxAddressTree extends ProviderBase {
       version: _GearboxAddressTree.version,
       tree: Object.fromEntries(this.#visited)
     };
-    await writeFile3(this.outFile, json_stringify(content), "utf-8");
+    await writeFile4(this.outFile, json_stringify(content), "utf-8");
     this.logger.trace(`saved to ${this.#outFile}`);
   }
   async #process(entry, block) {
@@ -392945,7 +393040,7 @@ import path7 from "node:path";
 
 // ../../packages/node/dist/meta/MetaRepo.js
 import { mkdirSync as mkdirSync4 } from "node:fs";
-import { readFile as readFile6 } from "node:fs/promises";
+import { readFile as readFile7 } from "node:fs/promises";
 import path6 from "node:path";
 var META_REPO = "deploy-v3";
 var MetaRepo = class {
@@ -392987,7 +393082,7 @@ var MetaRepo = class {
     for (const f of files) {
       const fname = path6.basename(f, `.json`);
       if (isAddress(fname)) {
-        const meta2 = await readFile6(path6.resolve(metaRoot, f), "utf-8").then(json_parse);
+        const meta2 = await readFile7(path6.resolve(metaRoot, f), "utf-8").then(json_parse);
         if (!meta2.encodedConstructorArgs.startsWith("0x")) {
           throw new Error(`expect encodedConstructorArgs for ${fname} to start with '0x'`);
         }
@@ -395884,6 +395979,7 @@ var ZeroLT = class extends ProviderBase {
     for (const cm of cms) {
       await setLTZero(this.client, {
         ...cm,
+        // fake v3.0 to v3.1 compatibility
         baseParams: {
           addr: cm.addr
         }
@@ -396971,99 +397067,6 @@ function audit() {
 // src/commands/open-accounts.ts
 import { writeFile as writeFile5 } from "node:fs/promises";
 import path8 from "node:path";
-
-// src/commands/sdk/SdkExample.ts
-import { readFile as readFile7, writeFile as writeFile4 } from "node:fs/promises";
-var SdkExample = class {
-  #sdk;
-  async run(opts) {
-    let {
-      addressProvider,
-      addressProviderJson,
-      marketConfiguratorJson,
-      anvilUrl = "http://127.0.0.1:8545",
-      outFile
-    } = opts;
-    let marketConfigurator;
-    try {
-      const mc = await readFile7(marketConfiguratorJson, "utf-8").then(
-        JSON.parse
-      );
-      marketConfigurator = mc.marketConfigurator;
-      if (!isAddress(marketConfigurator)) {
-        throw new Error("marketConfigurator is not a valid address");
-      }
-    } catch (e) {
-      throw new Error(
-        `cannot read market configurator json ${marketConfiguratorJson}: ${e}`
-      );
-    }
-    if (!addressProvider) {
-      if (!addressProviderJson) {
-        throw new Error("addressProvider is not specified");
-      }
-      log_default.debug(`reading address provider json ${addressProviderJson}`);
-      const apFile = await readFile7(addressProviderJson, "utf-8").then(
-        JSON.parse
-      );
-      addressProvider = apFile.addressProvider;
-    }
-    if (!addressProvider) {
-      throw new Error("addressProvider is not specified");
-    }
-    log_default.info(`using address provider ${addressProvider}`);
-    if (!isAddress(addressProvider)) {
-      throw new Error("addressProvider is not a valid address");
-    }
-    this.#sdk = await GearboxSDK.attach({
-      rpcURLs: [anvilUrl],
-      timeout: 48e4,
-      addressProvider,
-      logger: log_default,
-      ignoreUpdateablePrices: true,
-      marketConfigurators: [marketConfigurator]
-    });
-    const puTx = await this.#sdk.priceFeeds.getUpdatePriceFeedsTx(
-      GEARBOX_RISK_CURATORS[this.#sdk.provider.networkType]
-    );
-    const updater = createWalletClient({
-      account: privateKeyToAccount(
-        "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
-        // well-known anvil private key
-      ),
-      transport: http(anvilUrl)
-    });
-    const publicClient = createPublicClient({
-      transport: http(anvilUrl)
-    });
-    const hash2 = await sendRawTx(updater, { tx: puTx });
-    await publicClient.waitForTransactionReceipt({ hash: hash2 });
-    await this.#sdk.marketRegister.loadMarkets(
-      GEARBOX_RISK_CURATORS[this.#sdk.provider.networkType],
-      true
-    );
-    log_default.info("attached sdk");
-    if (outFile) {
-      try {
-        await writeFile4(
-          outFile,
-          json_stringify(this.#sdk.stateHuman()),
-          "utf-8"
-        );
-      } catch (e) {
-        log_default.error(`failed to write to ${outFile}: ${e}`);
-      }
-    }
-  }
-  get sdk() {
-    if (!this.#sdk) {
-      throw new Error("sdk is not attached");
-    }
-    return this.#sdk;
-  }
-};
-
-// src/commands/open-accounts.ts
 function openAccounts() {
   return newCommand().name("open-accounts").description("Script to open accounts in v3.1").addOption(
     new Option(
@@ -397084,7 +397087,7 @@ function openAccounts() {
       anvilUrl = "http://127.0.0.1:8545",
       sharedDir = "."
     } = opts;
-    const sdkExample2 = new SdkExample();
+    const sdkExample2 = new SDKExample(log_default);
     await sdkExample2.run({
       addressProvider,
       addressProviderJson,
@@ -397196,7 +397199,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.2.0",
+  version: "5.2.2",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -397239,7 +397242,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.131",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.134",
     "@gearbox-protocol/sdk-gov": "^2.33.1",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.2",
@@ -397360,7 +397363,7 @@ function sdkExample() {
       anvilUrl = "http://127.0.0.1:8545",
       sharedDir = "."
     } = opts;
-    const sdkExample2 = new SdkExample();
+    const sdkExample2 = new SDKExample(log_default);
     await sdkExample2.run({
       addressProvider,
       addressProviderJson,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "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.131",
+    "@gearbox-protocol/sdk": "^3.0.0-vfour.134",
     "@gearbox-protocol/sdk-gov": "^2.33.1",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.2",