@gearbox-protocol/deploy-tools 5.20.2 → 5.21.1

package/dist/index.mjs

@@ -408619,13 +408619,6 @@ var ForkTemplate = z.object({
 });
 
 // ../../packages/shared/dist/governor.js
-var GOVERNOR = {
-  Mainnet: "0x29B97F37B3E0C704bCFD785F5b7bBa2A0B7df2c7",
-  Arbitrum: "0xF0C89a0eDCD68B4176A26B3bf7574498DD3E6d09",
-  Optimism: "0xF0C89a0eDCD68B4176A26B3bf7574498DD3E6d09",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x1f3Ee385ce9A6333d73b61086349C4d0f5De0da8"
-};
 var EVENT_TO_STATUS = {
   QueueBatch: "queued",
   ExecuteBatch: "executed",
@@ -408638,21 +408631,15 @@ var GOVERNOR_EVENTS = [
 ];
 var TimelockQueueTransaction = parseAbiItem("event QueueTransaction( bytes32 indexed txHash, address indexed target, uint256 value, string signature, bytes data, uint256 eta )");
 async function loadGovernorBatches(opts) {
-  const { client, logger: logger2, governor: gov, fromBlock, toBlock } = opts;
-  let governor = gov;
-  if (!governor) {
-    const chainId = await client.getChainId();
-    const networkType = getNetworkType(chainId);
-    governor = GOVERNOR[networkType];
-  }
+  const { client, logger: logger2, address, fromBlock, toBlock } = opts;
   const timelock = await client.readContract({
-    address: governor,
+    address,
     abi: iGovernorAbi,
     functionName: "timeLock"
   });
-  logger2?.info({ timelock, governor, fromBlock, toBlock }, "reading from governor and timelock");
+  logger2?.info({ timelock, governor: address, fromBlock, toBlock }, "reading from governor and timelock");
   let govLogs = await client.getLogs({
-    address: governor,
+    address,
     events: GOVERNOR_EVENTS,
     fromBlock,
     toBlock,
@@ -410778,6 +410765,133 @@ var SafeApiWrapper = class {
   }
 };
 
+// ../../packages/shared/dist/utilityContracts.js
+var ADDRESS_PROVIDER2 = {
+  Mainnet: "0x9ea7b04Da02a5373317D745c1571c84aaD03321D",
+  Arbitrum: "0x7d04eCdb892Ae074f03B5D0aBA03796F90F3F2af",
+  Optimism: "0x3761ca4BFAcFCFFc1B8034e69F19116dD6756726",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x4b27b296273B72d7c7bfee1ACE93DC081467C41B"
+};
+var GOVERNOR = {
+  Mainnet: "0x29B97F37B3E0C704bCFD785F5b7bBa2A0B7df2c7",
+  Arbitrum: "0xF0C89a0eDCD68B4176A26B3bf7574498DD3E6d09",
+  Optimism: "0xF0C89a0eDCD68B4176A26B3bf7574498DD3E6d09",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x1f3Ee385ce9A6333d73b61086349C4d0f5De0da8"
+};
+var TIMELOCK2 = {
+  Mainnet: "0xa133C9A92Fb8dDB962Af1cbae58b2723A0bdf23b",
+  Arbitrum: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A",
+  Optimism: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A",
+  Base: NOT_DEPLOYED,
+  Sonic: "0xAdbF876ce58CB65c99b18078353e1DCB16E69e84"
+};
+var BATCH_CHAIN = {
+  Mainnet: "0xB900bDEf6eAc8C5D97F8e876aBC39573Cf6626b2",
+  Arbitrum: "0xAEbaa1015D0bc250F5b38aac9b8f65E0668cE3c2",
+  Optimism: "0x5CfB7F186dEA745381ccb1D532e43223B5a6AD10",
+  Base: NOT_DEPLOYED,
+  Sonic: "0xDe6c55B81442AF66Fd12508e15807fe2b92Be76D"
+};
+var BLACKLIST_HELPER = {
+  Mainnet: "0xFfbF344741654a1B9Ab1286Cf05A42f275F67839",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var CREATE2FACTORY = {
+  Mainnet: "0x45d146CAA25aa565Cfc7434926633f4F1C97c873",
+  Arbitrum: "0xad1231A64eE68D6BF721a1E8e177776cc49bAA2C",
+  Optimism: "0xad1231A64eE68D6BF721a1E8e177776cc49bAA2C",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A"
+};
+var MULTISIG = {
+  Mainnet: "0xA7D5DDc1b8557914F158076b228AA91eF613f1D5",
+  Arbitrum: "0x57Fd8B1a9213624157786Fff4a7bc532Ce717773",
+  Optimism: "0x8bA8cd6D00919ceCc19D9B4A2c8669a524883C4c",
+  Base: NOT_DEPLOYED,
+  Sonic: "0xacEB9dc6a81f1C9E2d8a86c3bFec3f6EF584139D"
+};
+var VETO_ADMIN = {
+  Mainnet: "0xbb803559B4D58b75E12dd74641AB955e8B0Df40E",
+  Arbitrum: "0x746fb3AcAfF6Bfe246206EC2E51F587d2E57abb6",
+  Optimism: "0x9744f76dc5239Eb4DC2CE8D5538e1BA89C8FA90f",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x393eC629b90389F957c5a2E4FC2F8F488e735BFC"
+};
+var TREASURY = {
+  Mainnet: "0x7b065fcb0760df0cea8cfd144e08554f3cea73d1",
+  Arbitrum: "0x2c31eFFE426765E68A43163A96DD13DF70B53C14",
+  Optimism: "0x1ACc5BC353f23B901801f3Ba48e1E51a14263808",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x74028Cf1cBa6A4513c9a27137E7d0F3847833795"
+};
+var ROUTER_MULTISIG_ADDRESS = {
+  Mainnet: "0xaaDf86C39a76eEEf5a5337Ca449C7EfA66E3175E",
+  Arbitrum: "0xEAb23245937A4F0894B0c92f08992C2c45Fc8df5",
+  Optimism: "0x4cda5Fa96B5d436002175d958667C7EF3B644aA1",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x21DEE3c9bAc88F8cb96b7e7d19D3DFDB071EC81d"
+};
+var ROUTER_CREATE2FACTORY = {
+  Mainnet: "0xA287577Fb7Cf49246e569EA268FE919F1cD6d9E2",
+  Arbitrum: "0x95345A4d55DAf6864924fC8861b311B9BC860E5f",
+  Optimism: "0x95345A4d55DAf6864924fC8861b311B9BC860E5f",
+  Base: NOT_DEPLOYED,
+  Sonic: "0x5CfB7F186dEA745381ccb1D532e43223B5a6AD10"
+};
+var NEXO_ADDRESS_PROVIDER = {
+  Mainnet: "0x2Eb0BE5585E49190414307597912BD039a029Eda",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var NEXO_TIMELOCK = {
+  Mainnet: "0xdcC3FD83DBF480e8Ad74DD3A634CaE29B68b9814",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var NEXO_GOVERNOR = {
+  Mainnet: "0x42Cf536467f4fa474010a16f66A3fa7576f987D6",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var NEXO_BATCH_CHAIN = {
+  Mainnet: "0xcba71ACEDe17d2CABBfADBab30cc08F20eeaca52",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var NEXO_CREATE2FACTORY = {
+  Mainnet: "0x48D945ACc64043B10A781917bfB88dDF49e06Fc6",
+  Arbitrum: NOT_DEPLOYED,
+  Optimism: NOT_DEPLOYED,
+  Base: NOT_DEPLOYED,
+  Sonic: NOT_DEPLOYED
+};
+var UTILITY_CONTRACTS = {
+  ADDRESS_PROVIDER: ADDRESS_PROVIDER2,
+  GOVERNOR,
+  TIMELOCK: TIMELOCK2,
+  BATCH_CHAIN,
+  BLACKLIST_HELPER,
+  CREATE2FACTORY,
+  MULTISIG,
+  VETO_ADMIN,
+  TREASURY,
+  ROUTER_MULTISIG_ADDRESS,
+  ROUTER_CREATE2FACTORY
+};
+
 // ../../packages/shared/dist/version.js
 function major(v) {
   return v >= 100 ? Math.floor(v / 100) : v;
@@ -411630,93 +411744,6 @@ async function setLTZero(anvil, cm, logger2) {
   await anvil.stopImpersonatingAccount({ address: configuratorAddr });
 }
 
-// ../../packages/node/dist/utilityContracts.js
-var utilityContracts_exports = {};
-__export(utilityContracts_exports, {
-  ADDRESS_PROVIDER: () => ADDRESS_PROVIDER2,
-  BATCH_CHAIN: () => BATCH_CHAIN,
-  BLACKLIST_HELPER: () => BLACKLIST_HELPER,
-  CREATE2FACTORY: () => CREATE2FACTORY,
-  GOVERNOR: () => GOVERNOR2,
-  MULTISIG: () => MULTISIG,
-  ROUTER_CREATE2FACTORY: () => ROUTER_CREATE2FACTORY,
-  ROUTER_MULTISIG_ADDRESS: () => ROUTER_MULTISIG_ADDRESS,
-  TIMELOCK: () => TIMELOCK2,
-  TREASURY: () => TREASURY,
-  VETO_ADMIN: () => VETO_ADMIN
-});
-var ADDRESS_PROVIDER2 = {
-  Mainnet: "0x9ea7b04Da02a5373317D745c1571c84aaD03321D",
-  Arbitrum: "0x7d04eCdb892Ae074f03B5D0aBA03796F90F3F2af",
-  Optimism: "0x3761ca4BFAcFCFFc1B8034e69F19116dD6756726",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x4b27b296273B72d7c7bfee1ACE93DC081467C41B"
-};
-var TIMELOCK2 = {
-  Mainnet: "0xa133C9A92Fb8dDB962Af1cbae58b2723A0bdf23b",
-  Arbitrum: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A",
-  Optimism: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A",
-  Base: NOT_DEPLOYED,
-  Sonic: "0xAdbF876ce58CB65c99b18078353e1DCB16E69e84"
-};
-var GOVERNOR2 = GOVERNOR;
-var BATCH_CHAIN = {
-  Mainnet: "0xB900bDEf6eAc8C5D97F8e876aBC39573Cf6626b2",
-  Arbitrum: "0xAEbaa1015D0bc250F5b38aac9b8f65E0668cE3c2",
-  Optimism: "0x5CfB7F186dEA745381ccb1D532e43223B5a6AD10",
-  Base: NOT_DEPLOYED,
-  Sonic: "0xDe6c55B81442AF66Fd12508e15807fe2b92Be76D"
-};
-var BLACKLIST_HELPER = {
-  Mainnet: "0xFfbF344741654a1B9Ab1286Cf05A42f275F67839",
-  Arbitrum: NOT_DEPLOYED,
-  Optimism: NOT_DEPLOYED,
-  Base: NOT_DEPLOYED,
-  Sonic: NOT_DEPLOYED
-};
-var CREATE2FACTORY = {
-  Mainnet: "0x45d146CAA25aa565Cfc7434926633f4F1C97c873",
-  Arbitrum: "0xad1231A64eE68D6BF721a1E8e177776cc49bAA2C",
-  Optimism: "0xad1231A64eE68D6BF721a1E8e177776cc49bAA2C",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x148DD932eCe1155c11006F5650c6Ff428f8D374A"
-};
-var MULTISIG = {
-  Mainnet: "0xA7D5DDc1b8557914F158076b228AA91eF613f1D5",
-  Arbitrum: "0x57Fd8B1a9213624157786Fff4a7bc532Ce717773",
-  Optimism: "0x8bA8cd6D00919ceCc19D9B4A2c8669a524883C4c",
-  Base: NOT_DEPLOYED,
-  Sonic: "0xacEB9dc6a81f1C9E2d8a86c3bFec3f6EF584139D"
-};
-var VETO_ADMIN = {
-  Mainnet: "0xbb803559B4D58b75E12dd74641AB955e8B0Df40E",
-  Arbitrum: "0x746fb3AcAfF6Bfe246206EC2E51F587d2E57abb6",
-  Optimism: "0x9744f76dc5239Eb4DC2CE8D5538e1BA89C8FA90f",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x393eC629b90389F957c5a2E4FC2F8F488e735BFC"
-};
-var TREASURY = {
-  Mainnet: "0x7b065fcb0760df0cea8cfd144e08554f3cea73d1",
-  Arbitrum: "0x2c31eFFE426765E68A43163A96DD13DF70B53C14",
-  Optimism: "0x1ACc5BC353f23B901801f3Ba48e1E51a14263808",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x74028Cf1cBa6A4513c9a27137E7d0F3847833795"
-};
-var ROUTER_MULTISIG_ADDRESS = {
-  Mainnet: "0xaaDf86C39a76eEEf5a5337Ca449C7EfA66E3175E",
-  Arbitrum: "0xEAb23245937A4F0894B0c92f08992C2c45Fc8df5",
-  Optimism: "0x4cda5Fa96B5d436002175d958667C7EF3B644aA1",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x21DEE3c9bAc88F8cb96b7e7d19D3DFDB071EC81d"
-};
-var ROUTER_CREATE2FACTORY = {
-  Mainnet: "0xA287577Fb7Cf49246e569EA268FE919F1cD6d9E2",
-  Arbitrum: "0x95345A4d55DAf6864924fC8861b311B9BC860E5f",
-  Optimism: "0x95345A4d55DAf6864924fC8861b311B9BC860E5f",
-  Base: NOT_DEPLOYED,
-  Sonic: "0x5CfB7F186dEA745381ccb1D532e43223B5a6AD10"
-};
-
 // ../../packages/node/dist/ProviderBase.js
 var NetworkMismatchError = class extends Error {
   constructor(expected, received) {
@@ -411853,7 +411880,7 @@ var ProviderBase = class {
         return overridden;
       }
     }
-    const addr = utilityContracts_exports[contract][this.network];
+    const addr = UTILITY_CONTRACTS[contract][this.network];
     if (!isAddress(addr)) {
       throw new Error(`${contract} is not deployed on ${this.network}: address ${addr}`);
     }
@@ -413646,6 +413673,34 @@ var GearboxAddressTree = class _GearboxAddressTree extends ProviderBase {
           discoveryBlock: GEARBOX_V1_BLOCK
         }
       ]);
+      queued = this.#addWellKnown(queued, [
+        {
+          address: NEXO_ADDRESS_PROVIDER.Mainnet,
+          contract: "ADDRESS_PROVIDER_V3",
+          version: 300,
+          discoveryBlock: Number(ADDRESS_PROVIDER_BLOCK[this.network])
+        },
+        {
+          address: NEXO_CREATE2FACTORY.Mainnet,
+          contract: "CREATE2_FACTORY",
+          version: VERSION_UNVERSIONED
+        },
+        {
+          address: NEXO_GOVERNOR.Mainnet,
+          contract: "GOVERNOR_V3",
+          version: VERSION_UNVERSIONED
+        },
+        {
+          address: NEXO_TIMELOCK.Mainnet,
+          contract: "TIMELOCK",
+          version: VERSION_UNVERSIONED
+        },
+        {
+          address: NEXO_BATCH_CHAIN.Mainnet,
+          contract: "BATCH_CHAIN",
+          version: VERSION_UNVERSIONED
+        }
+      ]);
     }
     this.logger.info(`started building gearbox address tree till block ${head}`);
     for (const entry of queued) {
@@ -416673,7 +416728,7 @@ var UpdateParser = class extends ProviderBase {
     if (batchDir) {
       await this.#parseBatchDir(batchDir, opts.unsafeMainnetMeta);
     } else if (governor) {
-      await this.#parseGovernorQueue(governor.fromBlock, governor.toBlock);
+      await this.#parseGovernorQueue(governor.address, governor.fromBlock, governor.toBlock);
     } else {
       await this.#parseSafeTxHashes(safeTxHashes);
     }
@@ -416780,12 +416835,12 @@ var UpdateParser = class extends ProviderBase {
     this.#collectCreate2Addresses(parsed);
     return parsed;
   }
-  async #parseGovernorQueue(fromBlock, toBlock) {
+  async #parseGovernorQueue(governorAddress, fromBlock, toBlock) {
     this.logger.info("parsing governor queue");
     const latest = await this.client.getBlockNumber();
     const batches = await loadGovernorBatches({
       client: this.client,
-      governor: this.address("GOVERNOR"),
+      address: governorAddress ?? this.address("GOVERNOR"),
       fromBlock: fromBlock ?? ADDRESS_PROVIDER_BLOCK[this.network],
       toBlock: toBlock ?? latest,
       logger: this.logger
@@ -418958,7 +419013,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.20.2",
+  version: "5.21.1",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -419056,6 +419111,11 @@ function parse() {
       "Safe tx hashes to get from safe api and verify"
     )
   ).addOption(new Option("--governor", "Parse entire governor queue")).addOption(
+    new Option(
+      "--governor-address <address>",
+      "Optional governor address"
+    ).argParser(parseAddress2)
+  ).addOption(
     new Option(
       "--governor-from <starting block>",
       "Parse governor queue starting from this block"
@@ -419081,24 +419141,36 @@ function parse() {
       "-i, --interactive",
       "Interactive navigation for pretty-print"
     )
-  ).addOption(new Option("--html-file <file>", "output html file")).action(async ({ governor, governorFrom, governorTo, ...opts }) => {
-    container.auditor = new Auditor(opts);
-    await container.auditor.setup();
-    container.addressTree = new GearboxAddressTree(opts);
-    await container.addressTree.build();
-    const options = {
-      ...opts,
-      safeTxHashes: opts.safeTxHashes,
-      governor: governor || governorFrom || governorTo ? { fromBlock: governorFrom, toBlock: governorTo } : void 0
-    };
-    const parser = new UpdateParser(opts, version_default);
-    const result = await parser.parse(options);
-    if (opts.outFile) {
-      await writeFile5(opts.outFile, json_stringify(result), "utf-8");
+  ).addOption(new Option("--html-file <file>", "output html file")).action(
+    async ({
+      governor,
+      governorFrom,
+      governorTo,
+      governorAddress,
+      ...opts
+    }) => {
+      container.auditor = new Auditor(opts);
+      await container.auditor.setup();
+      container.addressTree = new GearboxAddressTree(opts);
+      await container.addressTree.build();
+      const options = {
+        ...opts,
+        safeTxHashes: opts.safeTxHashes,
+        governor: governor || governorFrom || governorTo ? {
+          address: governorAddress,
+          fromBlock: governorFrom,
+          toBlock: governorTo
+        } : void 0
+      };
+      const parser = new UpdateParser(opts, version_default);
+      const result = await parser.parse(options);
+      if (opts.outFile) {
+        await writeFile5(opts.outFile, json_stringify(result), "utf-8");
+      }
+      const renderer = getRenderer(opts);
+      return renderer?.render(result);
     }
-    const renderer = getRenderer(opts);
-    return renderer?.render(result);
-  });
+  );
 }
 
 // src/commands/prices.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gearbox-protocol/deploy-tools",
   "description": "Gearbox deploy tools",
-  "version": "5.20.2",
+  "version": "5.21.1",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"