@gearbox-protocol/deploy-tools 3.0.4 → 3.2.0

package/dist/index.mjs

@@ -155463,8 +155463,8 @@ var require_network = __commonJS({
        *  Gets a list of all plugins that match %%name%%, with otr without
        *  a fragment.
        */
-      getPlugins(basename) {
-        return this.plugins.filter((p) => p.name.split("#")[0] === basename);
+      getPlugins(basename2) {
+        return this.plugins.filter((p) => p.name.split("#")[0] === basename2);
       }
       /**
        *  Create a copy of this Network.
@@ -311042,8 +311042,8 @@ var Network = class _Network {
    *  Gets a list of all plugins that match %%name%%, with otr without
    *  a fragment.
    */
-  getPlugins(basename) {
-    return this.plugins.filter((p) => p.name.split("#")[0] === basename);
+  getPlugins(basename2) {
+    return this.plugins.filter((p) => p.name.split("#")[0] === basename2);
   }
   /**
    *  Create a copy of this Network.
@@ -316506,7 +316506,7 @@ function compareAudited(a, b3) {
 
 // ../../packages/node/dist/helpers/batches.js
 import { readFile } from "node:fs/promises";
-import { resolve as resolve2 } from "node:path";
+import { basename, resolve as resolve2 } from "node:path";
 var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
 
 // ../../packages/node/dist/helpers/fs.js
@@ -316654,6 +316654,14 @@ async function loadBatchDir(dir) {
       }
       meta2 = [...meta2, ...metaFile];
     }
+    if (file.includes("_meta/0x")) {
+      const address = basename(file).replace(/\.json$/, "");
+      if (!isAddress2(address)) {
+        throw new Error(`invalid metafile ${file}`);
+      }
+      const metaFile = await readFile(resolve2(dir, file), "utf8").then(json_parse);
+      meta2 = [...meta2, metaFile];
+    }
     if (file.endsWith(".queue.json")) {
       const name = file.replace(".queue.json", "");
       const executeFile = file.replace(".queue.json", ".execute.json");
@@ -316724,26 +316732,53 @@ function normalizeMultisigTx(tx) {
         eta: t.contractInputsValues.eta
       };
     }
-    if (!t.contractInputsValues.signature) {
-      throw new Error(`missing signature in tx ${t.to}.${t.contractMethod.name}`);
+    if (["queueTransaction", "executeTransaction", "cancelTransaction"].includes(t.contractMethod.name)) {
+      return normalizeTimelockTx(t);
     }
-    const sighash = id2(t.contractInputsValues.signature).substring(0, 10);
-    const frag = FunctionFragment2.from(t.contractInputsValues.signature);
-    const decoded = AbiCoder2.defaultAbiCoder().decode(frag.inputs, t.contractInputsValues.data);
-    return {
-      target: t.contractInputsValues.target,
-      value: t.contractInputsValues.value,
-      signature: t.contractInputsValues.signature,
-      parameters: frag.inputs.map((input, i) => ({
-        name: input.name,
-        type: input.type,
-        value: decoded[i]
-      })),
-      data: t.contractInputsValues.data.replace("0x", sighash),
-      eta: t.contractInputsValues.eta
-    };
+    return normalizeDirectTx(t);
   });
 }
+function normalizeDirectTx(t) {
+  const frag = FunctionFragment2.from(t.contractMethod);
+  const iFace = new Interface2([frag]);
+  const parameters = t.contractMethod.inputs.map((i) => ({
+    name: i.name,
+    type: i.type,
+    value: t.contractInputsValues[i.name]
+  }));
+  const values = parameters.map((p) => {
+    try {
+      return json_parse(p.value);
+    } catch {
+      return p.value;
+    }
+  });
+  return {
+    target: t.to,
+    value: t.value,
+    signature: frag.format("minimal").replace("function ", ""),
+    parameters,
+    data: iFace.encodeFunctionData(frag, values)
+    // function 4byte signature + data
+  };
+}
+function normalizeTimelockTx(t) {
+  const sighash = id2(t.contractInputsValues.signature).substring(0, 10);
+  const frag = FunctionFragment2.from(t.contractInputsValues.signature);
+  const decoded = AbiCoder2.defaultAbiCoder().decode(frag.inputs, t.contractInputsValues.data);
+  return {
+    target: t.contractInputsValues.target,
+    value: t.contractInputsValues.value,
+    signature: t.contractInputsValues.signature,
+    parameters: frag.inputs.map((input, i) => ({
+      name: input.name,
+      type: input.type,
+      value: decoded[i]
+    })),
+    data: t.contractInputsValues.data.replace("0x", sighash),
+    eta: t.contractInputsValues.eta
+  };
+}
 function updateTitle(update) {
   if (update.format === "batch_pair") {
     const { queue, execute, name } = update;
@@ -324441,7 +324476,16 @@ var UpdateParser = class extends ProviderBase {
     this.logger.info(`[${i + 1}/${total}] processing ${updateTitle(batch)}`);
     const transactions = [];
     for (const tx of batch.transactions) {
-      transactions.push(await this.#parseNormalizedTx(tx, meta2));
+      try {
+        transactions.push(await this.#parseNormalizedTx(tx, meta2));
+      } catch (e) {
+        transactions.push({
+          error: `${e}`,
+          to: tx.target,
+          calldata: tx.data,
+          signature: tx.signature
+        });
+      }
     }
     return {
       ...batch,
@@ -325829,7 +325873,7 @@ function zeroLT() {
 }
 
 // package.json
-var version3 = "3.0.3";
+var version3 = "3.1.0";
 
 // src/index.ts
 var program2 = new Command();

package/package.json

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