@gearbox-protocol/deploy-tools 4.1.1 → 4.2.0-next.1

package/dist/index.mjs

@@ -317756,8 +317756,8 @@ function compareAudited(a, b3) {
 }
 
 // ../../packages/node/dist/helpers/batches.js
-function normalizeTransactions(tx) {
-  return tx.transactions.map((t) => {
+function normalizeTransactions(batch) {
+  return batch.transactions.map((t) => {
     if (
       // t.to === GOVERNOR_V3_ADDRESS &&
       t.contractMethod.name === "startBatch"
@@ -317765,9 +317765,9 @@ function normalizeTransactions(tx) {
       return {
         target: t.to,
         value: t.value,
-        signature: "startBatch()",
+        signature: "startBatch(uint80)",
         parameters: [],
-        data: id2("startBatch()").substring(0, 10),
+        data: id2("startBatch(uint80)").substring(0, 10) + toQuantity2(t.contractInputsValues.eta).replace("0x", "").padStart(64, "0"),
         eta: t.contractInputsValues.eta
       };
     }
@@ -317818,6 +317818,30 @@ function normalizeTimelockTx(t) {
     eta: t.contractInputsValues.eta
   };
 }
+function normalizeSafeApiBatch(tx) {
+  const transactions = tx.dataDecoded.parameters[0].valueDecoded.map((t) => ({
+    to: t.to,
+    value: t.value,
+    contractMethod: {
+      name: t.dataDecoded.method,
+      inputs: t.dataDecoded.parameters.map((p) => ({
+        name: p.name,
+        type: p.type
+      })),
+      payable: false
+    },
+    contractInputsValues: Object.fromEntries(t.dataDecoded.parameters.map((p) => [p.name, p.value]))
+  }));
+  return {
+    id: tx.safeTxHash,
+    safeTxHash: tx.safeTxHash,
+    description: "",
+    // TODO
+    transactions: normalizeTransactions({ transactions }),
+    type: "governor"
+    // TODO: determine, or wait till they are made the same in deploy-v3
+  };
+}
 
 // ../../packages/node/dist/helpers/fs.js
 import { readdir } from "node:fs/promises";
@@ -323121,7 +323145,7 @@ var GearboxAddressTree = class _GearboxAddressTree extends ProviderBase {
 
 // ../../packages/node/dist/UpdateParser.js
 import { mkdirSync as mkdirSync5 } from "node:fs";
-import { readdir as readdir2, rm as rm2, stat } from "node:fs/promises";
+import { readdir as readdir2, stat } from "node:fs/promises";
 import path7 from "node:path";
 
 // ../../packages/node/dist/DeployResult.js
@@ -325192,7 +325216,7 @@ var GearStakingV3Parser = class extends AbstractParser {
 var GovernorV3Parser = class extends AbstractParser {
   constructor(contractType) {
     super(contractType, "constructor(address _timeLock, address _queueAdmin, address _vetoAdmin)");
-    this._iFace = augmentInterface(IGovernor__factory.createInterface(), "function startBatch() external");
+    this._iFace = augmentInterface(IGovernor__factory.createInterface(), "function startBatch(uint80) external");
   }
 };
 
@@ -325577,10 +325601,8 @@ var UpdateParser = class extends ProviderBase {
   }
   async parse(opts) {
     await this.init();
-    const { batchRepo, batchCommittish, batchDir, safeTxHashes } = opts;
-    if (!!batchRepo && !!batchCommittish && !!batchDir) {
-      await this.#parseBatchRepoDir(batchRepo, batchCommittish, batchDir);
-    } else if (batchDir) {
+    const { batchDir, safeTxHashes } = opts;
+    if (batchDir) {
       await this.#parseBatchDir(batchDir);
     } else {
       await this.#parseSafeTxHashes(safeTxHashes);
@@ -325589,19 +325611,16 @@ var UpdateParser = class extends ProviderBase {
     return this.#output;
   }
   async #parseSafeTxHashes(hashes) {
-    const txs = this.getSafeTransactions(hashes);
-  }
-  async #parseBatchRepoDir(repo, committish, dir) {
-    await cloneRepo({
-      repo,
-      sandboxDir: this.#sandboxDir,
-      commit: committish,
-      destDir: path7.join(repo, committish)
-    });
-    const batchDir = path7.resolve(this.#sandboxDir, repo, committish, dir);
-    this.logger.debug(`will parse batches from ${batchDir}`);
-    await this.#parseBatchDir(batchDir);
-    await rm2(this.#sandboxDir, { force: true, recursive: true });
+    const txs = await this.getSafeTransactions(hashes);
+    const total = txs.length;
+    if (!total) {
+      this.logger.warn("no safe transactions to parse");
+      return;
+    }
+    for (let i = 0; i < txs.length; i++) {
+      const parsed = await this.#parseNormalizedBatch(normalizeSafeApiBatch(txs[i]), i, total);
+      this.#output.batches.push(parsed);
+    }
   }
   async #parseBatchDir(dir) {
     const batchStat = await stat(dir);
@@ -326877,13 +326896,6 @@ function parse() {
   return new Command().name("parse").description(
     "displays protocol updates from safe multisig or from batch json files"
   ).addOption(RpcURL()).addOption(
-    new Option(
-      "--batch-repo [repo]",
-      "Github repository with batch json files"
-    )
-  ).addOption(
-    new Option("--batch-committish [repo]", "Github repository committish")
-  ).addOption(
     new Option(
       "--batch-dir [dir]",
       "Directory (can be recursive) with batch and meta jsons"

package/package.json

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