@gearbox-protocol/deploy-tools 3.1.0 → 3.2.1

package/dist/index.mjs

@@ -316732,25 +316732,52 @@ 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);
+    }
+    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;
     }
-    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 {
+    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") {
@@ -325846,7 +325873,7 @@ function zeroLT() {
 }
 
 // package.json
-var version3 = "3.0.4";
+var version3 = "3.2.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.1.0",
+  "version": "3.2.1",
   "homepage": "https://gearbox.fi",
   "keywords": [
     "gearbox"