@gearbox-protocol/deploy-tools 5.15.4 → 5.16.1

package/dist/index.mjs

@@ -155123,7 +155123,7 @@ var require_structs = __commonJS({
       }
       return resolvedStructs;
     }
-    var typeWithoutTupleRegex2 = /^(?<type>[a-zA-Z$_][a-zA-Z0-9$_]*)(?<array>(?:\[\d*?\])+?)?$/;
+    var typeWithoutTupleRegex3 = /^(?<type>[a-zA-Z$_][a-zA-Z0-9$_]*)(?<array>(?:\[\d*?\])+?)?$/;
     function resolveStructs2(abiParameters, structs, ancestors = /* @__PURE__ */ new Set()) {
       const components = [];
       const length = abiParameters.length;
@@ -155133,7 +155133,7 @@ var require_structs = __commonJS({
         if (isTuple)
           components.push(abiParameter);
         else {
-          const match2 = (0, regex_js_1.execTyped)(typeWithoutTupleRegex2, abiParameter.type);
+          const match2 = (0, regex_js_1.execTyped)(typeWithoutTupleRegex3, abiParameter.type);
           if (!match2?.type)
             throw new abiParameter_js_1.InvalidAbiTypeParameterError({ abiParameter });
           const { array, type } = match2;
@@ -184693,7 +184693,7 @@ var require_abiItem2 = __commonJS({
     exports2.normalizeSignature = normalizeSignature3;
     exports2.isArgOfType = isArgOfType3;
     exports2.getAmbiguousTypes = getAmbiguousTypes3;
-    var Address = require_Address();
+    var Address2 = require_Address();
     var Errors = require_Errors();
     function normalizeSignature3(signature) {
       let active = true;
@@ -184742,7 +184742,7 @@ var require_abiItem2 = __commonJS({
       const abiParameterType = abiParameter.type;
       switch (abiParameterType) {
         case "address":
-          return Address.validate(arg, { strict: false });
+          return Address2.validate(arg, { strict: false });
         case "bool":
           return argType === "boolean";
         case "function":
@@ -184779,11 +184779,11 @@ var require_abiItem2 = __commonJS({
           if (types.includes("address") && types.includes("bytes20"))
             return true;
           if (types.includes("address") && types.includes("string"))
-            return Address.validate(args[parameterIndex], {
+            return Address2.validate(args[parameterIndex], {
               strict: false
             });
           if (types.includes("address") && types.includes("bytes"))
-            return Address.validate(args[parameterIndex], {
+            return Address2.validate(args[parameterIndex], {
               strict: false
             });
           return false;
@@ -185107,7 +185107,7 @@ var require_abiParameters = __commonJS({
     exports2.getArrayComponents = getArrayComponents3;
     exports2.hasDynamicChild = hasDynamicChild2;
     var AbiParameters = require_AbiParameters();
-    var Address = require_Address();
+    var Address2 = require_Address();
     var Bytes = require_Bytes();
     var Errors = require_Errors();
     var Hex = require_Hex();
@@ -185141,7 +185141,7 @@ var require_abiParameters = __commonJS({
     function decodeAddress2(cursor, options = {}) {
       const { checksum: checksum3 = false } = options;
       const value = cursor.readBytes(32);
-      const wrap = (address) => checksum3 ? Address.checksum(address) : address;
+      const wrap = (address) => checksum3 ? Address2.checksum(address) : address;
       return [wrap(Hex.fromBytes(Bytes.slice(value, -20))), 32];
     }
     function decodeArray2(cursor, param, options) {
@@ -185350,7 +185350,7 @@ var require_abiParameters = __commonJS({
     }
     function encodeAddress3(value, options) {
       const { checksum: checksum3 = false } = options;
-      Address.assert(value, { strict: checksum3 });
+      Address2.assert(value, { strict: checksum3 });
       return {
         dynamic: false,
         encoded: Hex.padLeft(value.toLowerCase())
@@ -185725,7 +185725,7 @@ var require_AbiParameters = __commonJS({
     exports2.format = format;
     exports2.from = from5;
     var abitype = require_exports();
-    var Address = require_Address();
+    var Address2 = require_Address();
     var Bytes = require_Bytes();
     var Errors = require_Errors();
     var Hex = require_Hex();
@@ -185796,7 +185796,7 @@ var require_AbiParameters = __commonJS({
       function encode5(type, value, isArray2 = false) {
         if (type === "address") {
           const address = value;
-          Address.assert(address);
+          Address2.assert(address);
           return Hex.padLeft(address.toLowerCase(), isArray2 ? 32 : 0);
         }
         if (type === "string")
@@ -186083,8 +186083,8 @@ var require_simulateCalls = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.simulateCalls = simulateCalls2;
-    var AbiConstructor = require_AbiConstructor();
-    var AbiFunction = require_AbiFunction();
+    var AbiConstructor2 = require_AbiConstructor();
+    var AbiFunction2 = require_AbiFunction();
     var parseAccount_js_1 = require_parseAccount();
     var address_js_1 = require_address7();
     var contracts_js_1 = require_contracts2();
@@ -186099,11 +186099,11 @@ var require_simulateCalls = __commonJS({
       const account = parameters.account ? (0, parseAccount_js_1.parseAccount)(parameters.account) : void 0;
       if (traceAssetChanges && !account)
         throw new base_js_1.BaseError("`account` is required when `traceAssetChanges` is true");
-      const getBalanceData = account ? AbiConstructor.encode(AbiConstructor.from("constructor(bytes, bytes)"), {
+      const getBalanceData = account ? AbiConstructor2.encode(AbiConstructor2.from("constructor(bytes, bytes)"), {
         bytecode: contracts_js_1.deploylessCallViaBytecodeBytecode,
         args: [
           getBalanceCode2,
-          AbiFunction.encodeData(AbiFunction.from("function getBalance(address)"), [account.address])
+          AbiFunction2.encodeData(AbiFunction2.from("function getBalance(address)"), [account.address])
         ]
       }) : void 0;
       const assetAddresses = traceAssetChanges ? await Promise.all(parameters.calls.map(async (call2) => {
@@ -186136,7 +186136,7 @@ var require_simulateCalls = __commonJS({
             {
               calls: assetAddresses.map((address, i) => ({
                 abi: [
-                  AbiFunction.from("function balanceOf(address) returns (uint256)")
+                  AbiFunction2.from("function balanceOf(address) returns (uint256)")
                 ],
                 functionName: "balanceOf",
                 args: [account.address],
@@ -186167,7 +186167,7 @@ var require_simulateCalls = __commonJS({
             {
               calls: assetAddresses.map((address, i) => ({
                 abi: [
-                  AbiFunction.from("function balanceOf(address) returns (uint256)")
+                  AbiFunction2.from("function balanceOf(address) returns (uint256)")
                 ],
                 functionName: "balanceOf",
                 args: [account.address],
@@ -186186,7 +186186,7 @@ var require_simulateCalls = __commonJS({
               calls: assetAddresses.map((address, i) => ({
                 to: address,
                 abi: [
-                  AbiFunction.from("function decimals() returns (uint256)")
+                  AbiFunction2.from("function decimals() returns (uint256)")
                 ],
                 functionName: "decimals",
                 from: address_js_1.zeroAddress,
@@ -186203,7 +186203,7 @@ var require_simulateCalls = __commonJS({
               calls: assetAddresses.map((address, i) => ({
                 to: address,
                 abi: [
-                  AbiFunction.from("function tokenURI(uint256) returns (string)")
+                  AbiFunction2.from("function tokenURI(uint256) returns (string)")
                 ],
                 functionName: "tokenURI",
                 args: [0n],
@@ -186220,7 +186220,7 @@ var require_simulateCalls = __commonJS({
             {
               calls: assetAddresses.map((address, i) => ({
                 to: address,
-                abi: [AbiFunction.from("function symbol() returns (string)")],
+                abi: [AbiFunction2.from("function symbol() returns (string)")],
                 functionName: "symbol",
                 from: address_js_1.zeroAddress,
                 nonce: i
@@ -406306,6 +406306,296 @@ var z = /* @__PURE__ */ Object.freeze({
   ZodError
 });
 
+// ../../node_modules/abitype/dist/esm/zod.js
+init_utils();
+init_regex();
+var Identifier = z.string().regex(/[a-zA-Z$_][a-zA-Z0-9$_]*/);
+var Address = z.string().transform((val, ctx) => {
+  const regex = /^0x[a-fA-F0-9]{40}$/;
+  if (!regex.test(val)) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Invalid Address ${val}`
+    });
+  }
+  return val;
+});
+var SolidityAddress = z.literal("address");
+var SolidityBool = z.literal("bool");
+var SolidityBytes = z.string().regex(bytesRegex);
+var SolidityFunction = z.literal("function");
+var SolidityString = z.literal("string");
+var SolidityTuple = z.literal("tuple");
+var SolidityInt = z.string().regex(integerRegex);
+var SolidityArrayWithoutTuple = z.string().regex(/^(address|bool|function|string|bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?|u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?)(\[[0-9]{0,}\])+$/);
+var SolidityArrayWithTuple = z.string().regex(/^tuple(\[[0-9]{0,}\])+$/);
+var SolidityArray = z.union([
+  SolidityArrayWithTuple,
+  SolidityArrayWithoutTuple
+]);
+var AbiParameter = z.lazy(() => z.intersection(z.object({
+  name: z.union([Identifier.optional(), z.literal("")]),
+  /** Representation used by Solidity compiler */
+  internalType: z.string().optional()
+}), z.union([
+  z.object({
+    type: z.union([
+      SolidityAddress,
+      SolidityBool,
+      SolidityBytes,
+      SolidityFunction,
+      SolidityString,
+      SolidityInt,
+      SolidityArrayWithoutTuple
+    ])
+  }),
+  z.object({
+    type: z.union([SolidityTuple, SolidityArrayWithTuple]),
+    components: z.array(AbiParameter).readonly()
+  })
+])));
+var AbiEventParameter = z.intersection(AbiParameter, z.object({ indexed: z.boolean().optional() }));
+var AbiStateMutability = z.union([
+  z.literal("pure"),
+  z.literal("view"),
+  z.literal("nonpayable"),
+  z.literal("payable")
+]);
+var AbiFunction = z.preprocess((val) => {
+  const abiFunction = val;
+  if (abiFunction.stateMutability === void 0) {
+    if (abiFunction.constant)
+      abiFunction.stateMutability = "view";
+    else if (abiFunction.payable)
+      abiFunction.stateMutability = "payable";
+    else
+      abiFunction.stateMutability = "nonpayable";
+  }
+  return val;
+}, z.object({
+  type: z.literal("function"),
+  /**
+   * @deprecated use `pure` or `view` from {@link AbiStateMutability} instead
+   * https://github.com/ethereum/solidity/issues/992
+   */
+  constant: z.boolean().optional(),
+  /**
+   * @deprecated Vyper used to provide gas estimates
+   * https://github.com/vyperlang/vyper/issues/2151
+   */
+  gas: z.number().optional(),
+  inputs: z.array(AbiParameter).readonly(),
+  name: Identifier,
+  outputs: z.array(AbiParameter).readonly(),
+  /**
+   * @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
+   * https://github.com/ethereum/solidity/issues/992
+   */
+  payable: z.boolean().optional(),
+  stateMutability: AbiStateMutability
+}));
+var AbiConstructor = z.preprocess((val) => {
+  const abiFunction = val;
+  if (abiFunction.stateMutability === void 0) {
+    if (abiFunction.payable)
+      abiFunction.stateMutability = "payable";
+    else
+      abiFunction.stateMutability = "nonpayable";
+  }
+  return val;
+}, z.object({
+  type: z.literal("constructor"),
+  /**
+   * @deprecated use `pure` or `view` from {@link AbiStateMutability} instead
+   * https://github.com/ethereum/solidity/issues/992
+   */
+  inputs: z.array(AbiParameter).readonly(),
+  /**
+   * @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
+   * https://github.com/ethereum/solidity/issues/992
+   */
+  payable: z.boolean().optional(),
+  stateMutability: z.union([z.literal("nonpayable"), z.literal("payable")])
+}));
+var AbiFallback = z.preprocess((val) => {
+  const abiFunction = val;
+  if (abiFunction.stateMutability === void 0) {
+    if (abiFunction.payable)
+      abiFunction.stateMutability = "payable";
+    else
+      abiFunction.stateMutability = "nonpayable";
+  }
+  return val;
+}, z.object({
+  type: z.literal("fallback"),
+  /**
+   * @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
+   * https://github.com/ethereum/solidity/issues/992
+   */
+  payable: z.boolean().optional(),
+  stateMutability: z.union([z.literal("nonpayable"), z.literal("payable")])
+}));
+var AbiReceive = z.object({
+  type: z.literal("receive"),
+  stateMutability: z.literal("payable")
+});
+var AbiEvent = z.object({
+  type: z.literal("event"),
+  anonymous: z.boolean().optional(),
+  inputs: z.array(AbiEventParameter).readonly(),
+  name: Identifier
+});
+var AbiError = z.object({
+  type: z.literal("error"),
+  inputs: z.array(AbiParameter).readonly(),
+  name: z.string()
+});
+var AbiItemType = z.union([
+  z.literal("constructor"),
+  z.literal("event"),
+  z.literal("error"),
+  z.literal("fallback"),
+  z.literal("function"),
+  z.literal("receive")
+]);
+var Abi = z.array(z.union([
+  AbiError,
+  AbiEvent,
+  // TODO: Replace code below to `z.switch` (https://github.com/colinhacks/zod/issues/2106)
+  // Need to redefine `AbiFunction | AbiConstructor | AbiFallback | AbiReceive` since `z.discriminate` doesn't support `z.preprocess` on `options`
+  // https://github.com/colinhacks/zod/issues/1490
+  z.preprocess((val) => {
+    const abiItem = val;
+    if (abiItem.type === "receive")
+      return abiItem;
+    if (val.stateMutability === void 0) {
+      if (abiItem.type === "function" && abiItem.constant)
+        abiItem.stateMutability = "view";
+      else if (abiItem.payable)
+        abiItem.stateMutability = "payable";
+      else
+        abiItem.stateMutability = "nonpayable";
+    }
+    return val;
+  }, z.intersection(z.object({
+    /**
+     * @deprecated use `pure` or `view` from {@link AbiStateMutability} instead
+     * https://github.com/ethereum/solidity/issues/992
+     */
+    constant: z.boolean().optional(),
+    /**
+     * @deprecated Vyper used to provide gas estimates
+     * https://github.com/vyperlang/vyper/issues/2151
+     */
+    gas: z.number().optional(),
+    /**
+     * @deprecated use `payable` or `nonpayable` from {@link AbiStateMutability} instead
+     * https://github.com/ethereum/solidity/issues/992
+     */
+    payable: z.boolean().optional()
+  }), z.discriminatedUnion("type", [
+    z.object({
+      type: z.literal("function"),
+      inputs: z.array(AbiParameter).readonly(),
+      name: z.string().regex(/[a-zA-Z$_][a-zA-Z0-9$_]*/),
+      outputs: z.array(AbiParameter).readonly(),
+      stateMutability: AbiStateMutability
+    }),
+    z.object({
+      type: z.literal("constructor"),
+      inputs: z.array(AbiParameter).readonly(),
+      stateMutability: z.union([
+        z.literal("payable"),
+        z.literal("nonpayable")
+      ])
+    }),
+    z.object({
+      type: z.literal("fallback"),
+      inputs: z.tuple([]).optional(),
+      stateMutability: z.union([
+        z.literal("payable"),
+        z.literal("nonpayable")
+      ])
+    }),
+    z.object({
+      type: z.literal("receive"),
+      stateMutability: z.literal("payable")
+    })
+  ])))
+])).readonly();
+var TypedDataDomain = z.object({
+  chainId: z.union([z.number(), z.bigint()]).optional(),
+  name: Identifier.optional(),
+  salt: z.string().optional(),
+  verifyingContract: Address.optional(),
+  version: z.string().optional()
+});
+var TypedDataType = z.union([
+  SolidityAddress,
+  SolidityBool,
+  SolidityBytes,
+  SolidityString,
+  SolidityInt,
+  SolidityArray
+]);
+var TypedDataParameter = z.object({
+  name: Identifier,
+  type: z.string()
+});
+var TypedData = z.record(Identifier, z.array(TypedDataParameter)).transform((val, ctx) => validateTypedDataKeys(val, ctx));
+function validateTypedDataKeys(typedData, zodContext) {
+  const keys2 = Object.keys(typedData);
+  for (let i = 0; i < keys2.length; i++) {
+    if (isSolidityType(keys2[i])) {
+      zodContext.addIssue({
+        code: "custom",
+        message: `Invalid key. ${keys2[i]} is a solidity type.`
+      });
+      return z.NEVER;
+    }
+    validateTypedDataParameters(keys2[i], typedData, zodContext);
+  }
+  return typedData;
+}
+var typeWithoutTupleRegex2 = /^(?<type>[a-zA-Z$_][a-zA-Z0-9$_]*?)(?<array>(?:\[\d*?\])+?)?$/;
+function validateTypedDataParameters(key, typedData, zodContext, ancestors = /* @__PURE__ */ new Set()) {
+  const val = typedData[key];
+  const length = val.length;
+  for (let i = 0; i < length; i++) {
+    if (val[i]?.type === key) {
+      zodContext.addIssue({
+        code: "custom",
+        message: `Invalid type. ${key} is a self reference.`
+      });
+      return z.NEVER;
+    }
+    const match2 = execTyped(typeWithoutTupleRegex2, val[i]?.type);
+    if (!match2?.type) {
+      zodContext.addIssue({
+        code: "custom",
+        message: `Invalid type. ${key} does not have a type.`
+      });
+      return z.NEVER;
+    }
+    if (match2.type in typedData) {
+      if (ancestors.has(match2.type)) {
+        zodContext.addIssue({
+          code: "custom",
+          message: `Invalid type. ${match2.type} is a circular reference.`
+        });
+        return z.NEVER;
+      }
+      validateTypedDataParameters(match2.type, typedData, zodContext, /* @__PURE__ */ new Set([...ancestors, match2.type]));
+    } else if (!isSolidityType(match2.type)) {
+      zodContext.addIssue({
+        code: "custom",
+        message: `Invalid type. ${match2.type} is not a valid EIP-712 type.`
+      });
+    }
+  }
+  return;
+}
+
 // ../../packages/shared/dist/fork-schema.js
 var ScriptTemplate = z.object({
   id: z.string().regex(/^[0-9a-zA-Z\-_]+$/, "invalid script id"),
@@ -406336,6 +406626,14 @@ var ForkTemplate = z.object({
    * Anvil chain id override, if not set, defaults to same as original network chain id (e.g. 1 for mainnet)
    */
   chainId: z.number().int().nonnegative().nullish().transform((v) => v || void 0),
+  /**
+   * Optional address provider pverride
+   */
+  addressProvider: Address.nullish(),
+  /**
+   * Optional market configurators override
+   */
+  marketConfigurators: z.array(Address).nullish(),
   /**
    * Will set appropriate RPC urls
    */
@@ -415949,7 +416247,7 @@ var UpdateParser = class extends ProviderBase {
     if (batchDir) {
       await this.#parseBatchDir(batchDir, opts.unsafeMainnetMeta);
     } else if (governor) {
-      await this.#parseGovernorQueue(governor === true ? void 0 : governor);
+      await this.#parseGovernorQueue(governor.fromBlock, governor.toBlock);
     } else {
       await this.#parseSafeTxHashes(safeTxHashes);
     }
@@ -417607,7 +417905,7 @@ function getRenderer(opts) {
 var package_default = {
   name: "@gearbox-protocol/deploy-tools",
   description: "Gearbox deploy tools",
-  version: "5.15.4",
+  version: "5.16.1",
   homepage: "https://gearbox.fi",
   keywords: [
     "gearbox"
@@ -417690,6 +417988,18 @@ var package_default = {
 // src/version.ts
 var version_default = package_default.version;
 
+// src/commands/option-parsers.ts
+function parseBigInt(value, _dummy) {
+  try {
+    const parsedValue = BigInt(value);
+    return parsedValue;
+  } catch (e) {
+    throw new InvalidArgumentError(
+      e instanceof Error ? e.message : "Not a number."
+    );
+  }
+}
+
 // src/commands/parse.ts
 function parse() {
   return newCommand().name("parse").description(
@@ -417706,11 +418016,16 @@ function parse() {
       "--safe-tx-hashes [hash...]",
       "Safe tx hashes to get from safe api and verify"
     )
+  ).addOption(new Option("--governor", "Parse entire governor queue")).addOption(
+    new Option(
+      "--governor-from <starting block>",
+      "Parse governor queue starting from this block"
+    ).argParser(parseBigInt)
   ).addOption(
     new Option(
-      "--governor [starting block]",
-      "Parse governor queue starting from block (or entire queue if not specified)"
-    )
+      "--governor-to <ending block>",
+      "Parse governor queue up to this block"
+    ).argParser(parseBigInt)
   ).addOption(
     new Option(
       "--unsafe-mainnet-meta",
@@ -417727,17 +418042,18 @@ function parse() {
       "-i, --interactive",
       "Interactive navigation for pretty-print"
     )
-  ).addOption(new Option("--html-file <file>", "output html file")).action(async (opts) => {
+  ).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 parser = new UpdateParser(opts, version_default);
-    const result = await parser.parse({
+    const options = {
       ...opts,
       safeTxHashes: opts.safeTxHashes,
-      governor: opts.governor ? opts.governor === true ? true : BigInt(opts.governor) : void 0
-    });
+      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 writeFile7(opts.outFile, json_stringify(result), "utf-8");
     }

package/package.json

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