@gearbox-protocol/deploy-tools 5.22.1 → 5.23.0

package/dist/index.mjs

@@ -135609,7 +135609,7 @@ var require_sonic_boom = __commonJS({
       if (!(this instanceof SonicBoom)) {
         return new SonicBoom(opts);
       }
-      let { fd, dest, minLength, maxLength, maxWrite, periodicFlush, sync, append = true, mkdir: mkdir3, retryEAGAIN, fsync, contentMode, mode } = opts || {};
+      let { fd, dest, minLength, maxLength, maxWrite, periodicFlush, sync, append = true, mkdir: mkdir4, retryEAGAIN, fsync, contentMode, mode } = opts || {};
       fd = fd || dest;
       this._len = 0;
       this.fd = -1;
@@ -135634,7 +135634,7 @@ var require_sonic_boom = __commonJS({
       this.append = append || false;
       this.mode = mode;
       this.retryEAGAIN = retryEAGAIN || (() => true);
-      this.mkdir = mkdir3 || false;
+      this.mkdir = mkdir4 || false;
       let fsWriteSync;
       let fsWrite;
       if (contentMode === kContentModeBuffer) {
@@ -146124,7 +146124,7 @@ var require_filesystem = __commonJS({
     var fs3 = __require("fs");
     var LDD_PATH = "/usr/bin/ldd";
     var readFileSync = (path12) => fs3.readFileSync(path12, "utf-8");
-    var readFile9 = (path12) => new Promise((resolve2, reject) => {
+    var readFile10 = (path12) => new Promise((resolve2, reject) => {
       fs3.readFile(path12, "utf-8", (err, data) => {
         if (err) {
           reject(err);
@@ -146136,7 +146136,7 @@ var require_filesystem = __commonJS({
     module2.exports = {
       LDD_PATH,
       readFileSync,
-      readFile: readFile9
+      readFile: readFile10
     };
   }
 });
@@ -146147,7 +146147,7 @@ var require_detect_libc = __commonJS({
     "use strict";
     var childProcess = __require("child_process");
     var { isLinux, getReport } = require_process();
-    var { LDD_PATH, readFile: readFile9, readFileSync } = require_filesystem();
+    var { LDD_PATH, readFile: readFile10, readFileSync } = require_filesystem();
     var cachedFamilyFilesystem;
     var cachedVersionFilesystem;
     var command = "getconf GNU_LIBC_VERSION 2>&1 || true; ldd --version 2>&1 || true";
@@ -146214,7 +146214,7 @@ var require_detect_libc = __commonJS({
       }
       cachedFamilyFilesystem = null;
       try {
-        const lddContent = await readFile9(LDD_PATH);
+        const lddContent = await readFile10(LDD_PATH);
         cachedFamilyFilesystem = getFamilyFromLddContent(lddContent);
       } catch (e) {
       }
@@ -146268,7 +146268,7 @@ var require_detect_libc = __commonJS({
       }
       cachedVersionFilesystem = null;
       try {
-        const lddContent = await readFile9(LDD_PATH);
+        const lddContent = await readFile10(LDD_PATH);
         const versionMatch = lddContent.match(RE_GLIBC_VERSION);
         if (versionMatch) {
           cachedVersionFilesystem = versionMatch[1];
@@ -408722,7 +408722,7 @@ async function loadGovernorBatches(opts) {
     type: "governor",
     transactions: b.transactions,
     status: b.status,
-    block: b.block,
+    blockNumber: b.block,
     queueTxHash: b.queueTxHash,
     eta: b.transactions[0]?.eta
   }));
@@ -408766,6 +408766,37 @@ function hexEq2(a, b) {
   return aa === bb;
 }
 
+// ../../packages/shared/dist/parser.js
+function transformParserToGovernorOutput(parserOutput) {
+  const createdAt = (/* @__PURE__ */ new Date()).toISOString();
+  const result = {};
+  for (const batch of parserOutput.batches) {
+    if (!batch.blockNumber) {
+      throw new Error("block number is required for governor batches");
+    }
+    const blockNumber = batch.blockNumber.toString(10);
+    if ("error" in batch) {
+      result[blockNumber] = {
+        blockNumber,
+        version: parserOutput.version,
+        createdAt,
+        error: batch.error,
+        transactions: [],
+        addresses: {}
+      };
+    } else {
+      result[blockNumber] = {
+        blockNumber,
+        version: parserOutput.version,
+        createdAt,
+        transactions: batch.transactions,
+        addresses: parserOutput.addresses
+      };
+    }
+  }
+  return result;
+}
+
 // ../../node_modules/lodash-es/_freeGlobal.js
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 var freeGlobal_default = freeGlobal;
@@ -413868,7 +413899,7 @@ var GearboxAddressTree = class _GearboxAddressTree extends ProviderBase {
 
 // ../../packages/node/dist/UpdateParser.js
 import { mkdirSync as mkdirSync5 } from "node:fs";
-import { stat } from "node:fs/promises";
+import { mkdir, readFile as readFile7, stat, writeFile as writeFile4 } from "node:fs/promises";
 import path7 from "node:path";
 
 // ../../packages/node/dist/meta/MetaRepo.js
@@ -416751,6 +416782,13 @@ var UpdateParser = class extends ProviderBase {
       await this.#parseBatchDir(batchDir, unsafeMainnetMeta);
     } else if (governor) {
       await this.#parseGovernorQueue(governor.address, governor.fromBlock, governor.toBlock);
+      if (opts.unifiedGovernorFile) {
+        try {
+          await this.#updateUnifiedGovernor(opts.unifiedGovernorFile, governor.address);
+        } catch (e) {
+          this.logger.error(`error updating unified governor file: ${e}`);
+        }
+      }
     } else {
       await this.#parseSafeTxHashes(safeTxHashes);
     }
@@ -416873,15 +416911,36 @@ var UpdateParser = class extends ProviderBase {
     for (let i = 0; i < queued.length; i++) {
       try {
         const parsed = await this.#parseNormalizedBatch(queued[i], i, queued.length);
+        parsed.blockNumber = queued[i].blockNumber;
         this.#output.batches.push(parsed);
       } catch (e) {
         this.#output.batches.push({
           id: queued[i].id,
-          error: `${e}`.replaceAll("\n", "\\n")
+          error: `${e}`.replaceAll("\n", "\\n"),
+          blockNumber: queued[i].blockNumber
         });
       }
     }
   }
+  async #updateUnifiedGovernor(unifiedFile, governor) {
+    const unifiedDir = path7.dirname(unifiedFile);
+    this.logger.debug(`reading unified governor batches from ${unifiedFile}`);
+    let unified = {};
+    try {
+      const raw = await readFile7(unifiedFile, "utf-8");
+      unified = json_parse(raw);
+      this.logger.debug(`reading unified governor file already exists, will merge`);
+    } catch (e) {
+      this.logger.warn(`error reading unified governor batches: ${e}`);
+    }
+    const newUnified = transformParserToGovernorOutput(this.#output);
+    this.logger.debug(`loaded new unified governor batches`);
+    unified = { ...unified, ...newUnified };
+    const newBatches = Object.keys(newUnified).length;
+    await mkdir(unifiedDir, { recursive: true });
+    await writeFile4(unifiedFile, json_stringify(unified), "utf-8");
+    this.logger.debug(`saved ${newBatches} unified governor batches to ${unifiedFile}`);
+  }
   #collectCreate2Addresses(tx) {
     if (isDeployTransaction(tx)) {
       this.#collectCreate2Addresses(tx.constructorTransaction);
@@ -418072,12 +418131,12 @@ function audit() {
 import path8 from "node:path";
 
 // src/commands/execute-jsons/execute.ts
-import { readFile as readFile7 } from "node:fs/promises";
+import { readFile as readFile8 } from "node:fs/promises";
 async function executeJSON({
   jsonPath,
   rpcURL
 }) {
-  const plain = await readFile7(jsonPath, "utf-8");
+  const plain = await readFile8(jsonPath, "utf-8");
   const txs = json_parse(plain);
   if (txs.length === 0) {
     log_default.error("No transactions found");
@@ -418197,7 +418256,7 @@ function executeJson() {
 
 // src/commands/open-accounts.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { mkdir, writeFile as writeFile4 } from "node:fs/promises";
+import { mkdir as mkdir2, writeFile as writeFile5 } from "node:fs/promises";
 import path9 from "node:path";
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/adapters/abi/iBalancerV3RouterAdapter.js
@@ -418799,7 +418858,7 @@ function openAccounts() {
       nexo,
       castBin = "cast"
     } = opts;
-    await mkdir(path9.resolve(sharedDir, "deploy-state"), { recursive: true });
+    await mkdir2(path9.resolve(sharedDir, "deploy-state"), { recursive: true });
     const transportOptions = getSDKTransportOptions({
       ...opts,
       anvilUrl
@@ -418816,12 +418875,12 @@ function openAccounts() {
         adapters: AdaptersPlugin
       }
     });
-    await writeFile4(
+    await writeFile5(
       path9.resolve(sharedDir, "deploy-state", "stateAfter.human.json"),
       json_stringify(sdk.stateHuman()),
       "utf-8"
     );
-    await writeFile4(
+    await writeFile5(
       path9.resolve(sharedDir, "deploy-state", "stateAfter.json"),
       json_stringify(sdk.state),
       "utf-8"
@@ -418926,8 +418985,8 @@ function openAccounts() {
       }
       const results = await accountOpener.openCreditAccounts(accounts, true);
       const destDir = path9.resolve(sharedDir, "open-accounts");
-      await mkdir(destDir, { recursive: true });
-      await writeFile4(
+      await mkdir2(destDir, { recursive: true });
+      await writeFile5(
         path9.resolve(destDir, "results.json"),
         json_stringify(results),
         "utf-8"
@@ -418983,7 +419042,7 @@ async function runCastCmd(args, traceId, opts) {
       log_default.warn(`failed to run cast: ${cast.error}`);
       return;
     }
-    await writeFile4(traceFile, cast.output.join(""), "utf-8");
+    await writeFile5(traceFile, cast.output.join(""), "utf-8");
     log_default.debug(`saved trace file: ${traceFile}`);
   } catch (e) {
     log_default.warn(`failed to save trace: ${e}`);
@@ -418991,7 +419050,7 @@ async function runCastCmd(args, traceId, opts) {
 }
 
 // src/commands/parse.ts
-import { writeFile as writeFile5 } from "node:fs/promises";
+import { writeFile as writeFile6 } from "node:fs/promises";
 
 // src/renderer/html/HtmlRenderer.tsx
 var import_react = __toESM(require_react(), 1);
@@ -419037,7 +419096,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.22.1",
+  version: "5.23.0",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -419149,6 +419208,11 @@ function parse() {
       "--governor-to <ending block>",
       "Parse governor queue up to this block"
     ).argParser(parseBigInt)
+  ).addOption(
+    new Option(
+      "--unified-governor-file <file>",
+      "Save unified governor batches to this file"
+    )
   ).addOption(
     new Option(
       "--unsafe-mainnet-meta",
@@ -419182,7 +419246,7 @@ function parse() {
     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");
+      await writeFile6(opts.outFile, json_stringify(result), "utf-8");
     }
     const renderer = getRenderer(opts);
     return renderer?.render(result);
@@ -419291,7 +419355,7 @@ function printSafeTx() {
 }
 
 // src/commands/sdk-example.ts
-import { mkdir as mkdir2, writeFile as writeFile6 } from "node:fs/promises";
+import { mkdir as mkdir3, writeFile as writeFile7 } from "node:fs/promises";
 import path11 from "node:path";
 
 // ../../node_modules/@gearbox-protocol/sdk/dist/esm/bots/abi/iPartialLiquidationBotV300.js
@@ -419714,7 +419778,7 @@ function sdkExample() {
       anvilUrl = "http://127.0.0.1:8545",
       sharedDir = "."
     } = opts;
-    await mkdir2(path11.resolve(sharedDir, "deploy-state"), { recursive: true });
+    await mkdir3(path11.resolve(sharedDir, "deploy-state"), { recursive: true });
     const anvil = createAnvilClient({ transport: http(anvilUrl) });
     await anvil.setBlockTimestampInterval({ interval: 0 });
     try {
@@ -419739,12 +419803,12 @@ function sdkExample() {
           bots: BotsPlugin
         }
       });
-      await writeFile6(
+      await writeFile7(
         path11.resolve(sharedDir, "deploy-state", "stateAfter.human.json"),
         json_stringify(sdk.stateHuman()),
         "utf-8"
       );
-      await writeFile6(
+      await writeFile7(
         path11.resolve(sharedDir, "deploy-state", "stateAfter.json"),
         json_stringify(sdk.state),
         "utf-8"
@@ -419757,7 +419821,7 @@ function sdkExample() {
 }
 
 // src/commands/verify-etherscan.ts
-import { readFile as readFile8 } from "node:fs/promises";
+import { readFile as readFile9 } from "node:fs/promises";
 function verifyEtherscan() {
   return newCommand().name("verify-etherscan").description(
     "performs bulk verification of gearbox contracts using etherscan"
@@ -419772,7 +419836,7 @@ function verifyEtherscan() {
     }
     let addresses = opts.addresses ?? [];
     if (addresses.length === 0 && opts.addressesFile) {
-      const content = await readFile8(opts.addressesFile, "utf-8");
+      const content = await readFile9(opts.addressesFile, "utf-8");
       addresses = Object.keys(json_parse(content));
     }
     if (!addresses.length) {

package/package.json

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