@gearbox-protocol/deploy-tools 1.6.0-next.4 → 1.6.0-next.6

package/dist/index.js

@@ -200247,8 +200247,7 @@ var require_git = __commonJS({
       "router-v3",
       "router"
     ];
-    function getGithubUrl(repo) {
-      const https = !!process.env.GITHUB_HTTPS;
+    function getGithubUrl(repo, https = false) {
       const path = repo.replace(/^@/, "").replace(/\/$/, "");
       return https ? `https://github.com/${path}.git` : `git@github.com:${path}.git`;
     }
@@ -205655,10 +205654,25 @@ var require_utils9 = __commonJS({
     }
     exports2.decodeBatchTx = decodeBatchTx;
     function extractFilesFromJSON(files) {
-      return Object.entries(files).map(([path, file]) => ({
-        path,
-        buffer: Buffer.isBuffer(file) ? file : Buffer.from(file)
-      }));
+      return Object.entries(files).map(([path, file]) => {
+        let buffer = null;
+        if (Buffer.isBuffer(file)) {
+          buffer = file;
+        } else if (typeof file === "string") {
+          buffer = Buffer.from(file, "utf8");
+        } else if (typeof file === "object") {
+          if (file && "content" in file && typeof file.content === "string") {
+            buffer = Buffer.from(file.content);
+          }
+        }
+        if (!buffer) {
+          throw new Error(`cannot convert ${typeof file} into buffer`);
+        }
+        return {
+          path,
+          buffer
+        };
+      });
     }
     exports2.extractFilesFromJSON = extractFilesFromJSON;
     function stringifyInvalidAndMissing(contract) {
@@ -205791,7 +205805,7 @@ var require_Auditor = __commonJS({
        * checks audit of etherscan verification result
        */
       async auditEtherscanVerified(contract) {
-        const input = JSON.parse(contract.SourceCode.substring(1, contract.SourceCode.length - 2));
+        const input = parseEtherscanSourceCode(contract);
         const files = (0, utils_1.extractFilesFromJSON)(input.sources).map(({ path, buffer }) => {
           const p = path.replace("node_modules/", "");
           const gearbox = p.startsWith("@gearbox-protocol");
@@ -205871,6 +205885,20 @@ var require_Auditor = __commonJS({
       }
     };
     exports2.Auditor = Auditor2;
+    function parseEtherscanSourceCode(contract) {
+      let substr = contract.SourceCode;
+      if (!substr.startsWith("{")) {
+        return { language: "", sources: { [contract.ContractName]: substr } };
+      }
+      try {
+        const first = contract.SourceCode.indexOf("{{");
+        const last = contract.SourceCode.lastIndexOf("}}");
+        substr = contract.SourceCode.substring(first + 1, last + 1);
+        return JSON.parse(substr);
+      } catch (e) {
+        throw new Error(`failed to parse '${substr}': ${e}`);
+      }
+    }
   }
 });
 
@@ -206695,6 +206723,9 @@ var require_EtherscanVerifier = __commonJS({
         __privateAdd(this, _cachePolicy, void 0);
         __privateAdd(this, _result, /* @__PURE__ */ new Map());
         __privateSet(this, _cachePolicy, opts.cachePolicy);
+        if (!opts.etherscanApiKey) {
+          throw new Error("etherscan api key not specified");
+        }
         __privateSet(this, _etherscanApi, axios_1.default.create({
           baseURL: "https://api.etherscan.io",
           headers: {
@@ -206723,16 +206754,7 @@ var require_EtherscanVerifier = __commonJS({
         __privateSet(this, _cacheDir, node_path_1.default.resolve(opts.sandboxDir, "etherscan"));
         (0, node_fs_1.mkdirSync)(__privateGet(this, _cacheDir), { recursive: true });
       }
-      async verify(input) {
-        var _a;
-        if (!((_a = input.addresses) == null ? void 0 : _a.length) && !input.addressesFile) {
-          throw new Error("please specify addresses or addresses file");
-        }
-        let addresses = input.addresses ?? [];
-        if (addresses.length === 0) {
-          const content = await (0, promises_1.readFile)(input.addressesFile, "utf-8");
-          addresses = Object.keys(JSON.parse(content));
-        }
+      async verifyMany(addresses) {
         for (const address of addresses) {
           if (!address.startsWith("0x")) {
             throw new Error(`invalid addresses detected: ${address}`);
@@ -206749,6 +206771,10 @@ var require_EtherscanVerifier = __commonJS({
         __privateGet(this, _logger).info(`verification completed: ${goodCnt}/${addresses.length} are verified`);
         return __privateGet(this, _result);
       }
+      async verify(address) {
+        await __privateMethod(this, _verify, verify_fn).call(this, address.toLowerCase());
+        return this.check(address);
+      }
       check(address) {
         const result = __privateGet(this, _result).get(address.toLowerCase());
         return result ?? { verified: false };
@@ -219548,7 +219574,7 @@ var require_CliRenderer = __commonJS({
         console.log(`use ${chalk_1.default.cyan("arrows")} for navigation, ${(0, chalk_1.default)("a")} to print all and exit, ${chalk_1.default.cyan("ESC")} to exit`);
       }
       const { safeTxHash, batchFile, actions } = tx;
-      const prefix = total > 1 ? ` ${i}/${total}` : "";
+      const prefix = total > 1 ? ` ${i + 1}/${total}` : "";
       if (safeTxHash) {
         console.log(`Safe tx${prefix} ${chalk_1.default.green(safeTxHash)}:`);
       }
@@ -294218,11 +294244,13 @@ var require_GearboxAddressTree = __commonJS({
     var orderBy_1 = __importDefault2(require_orderBy());
     var queue_1 = __importDefault2((init_queue(), __toCommonJS(queue_exports)));
     var table_1 = require_src3();
+    var Auditor_1 = require_Auditor();
+    var EtherscanVerifier_1 = require_EtherscanVerifier();
     var log_1 = __importDefault2(require_log());
     var contracts_1 = require_contracts2();
     var constants_1 = require_constants9();
     var visitors_1 = require_visitors();
-    var _logger, _provider, _outFile, _queue, _visited, _create2, _loadCache, loadCache_fn, _process, process_fn, _addToQueue, addToQueue_fn, _prettyPrint, prettyPrint_fn;
+    var _logger, _provider, _etherscan, _auditor, _outFile, _queue, _visited, _create2, _loadCache, loadCache_fn, _process, process_fn, _addToQueue, addToQueue_fn, _prettyPrint, prettyPrint_fn;
     var GearboxAddressTree3 = class {
       constructor(options) {
         __privateAdd(this, _loadCache);
@@ -294231,14 +294259,19 @@ var require_GearboxAddressTree = __commonJS({
         __privateAdd(this, _prettyPrint);
         __privateAdd(this, _logger, log_1.default.getSubLogger({ name: "tree" }));
         __privateAdd(this, _provider, void 0);
+        __privateAdd(this, _etherscan, void 0);
+        __privateAdd(this, _auditor, void 0);
         __privateAdd(this, _outFile, void 0);
         __privateAdd(this, _queue, new queue_1.default({ concurrency: 5 }));
         __privateAdd(this, _visited, /* @__PURE__ */ new Map());
         __privateAdd(this, _create2, /* @__PURE__ */ new Map());
         __privateSet(this, _provider, new ethers_1.ethers.providers.StaticJsonRpcProvider(options.mainnetRpc));
         __privateSet(this, _outFile, node_path_1.default.resolve(options.sandboxDir, "tree.json"));
+        __privateSet(this, _etherscan, new EtherscanVerifier_1.EtherscanVerifier(options));
+        __privateSet(this, _auditor, new Auditor_1.Auditor(options));
       }
       async build(cachePolicy) {
+        await __privateGet(this, _auditor).setup();
         let queued = [];
         if (cachePolicy !== "never") {
           queued = await __privateMethod(this, _loadCache, loadCache_fn).call(this);
@@ -294319,6 +294352,8 @@ var require_GearboxAddressTree = __commonJS({
     };
     _logger = new WeakMap();
     _provider = new WeakMap();
+    _etherscan = new WeakMap();
+    _auditor = new WeakMap();
     _outFile = new WeakMap();
     _queue = new WeakMap();
     _visited = new WeakMap();
@@ -294351,6 +294386,18 @@ var require_GearboxAddressTree = __commonJS({
         throw new Error(`detected ${entry.contract} with zero address`);
       }
       const newEntries = await (0, visitors_1.visitorFor)(entry).visit(entry, __privateGet(this, _provider), block);
+      const etherscanEntry = await __privateGet(this, _etherscan).verify(entry.address);
+      if (etherscanEntry.verified) {
+        entry.etherscan = [];
+        for (const contract of etherscanEntry.data) {
+          const audits = await __privateGet(this, _auditor).auditEtherscanVerified(contract);
+          entry.etherscan.push(...audits.map((a) => ({
+            repo: a.repo,
+            path: a.path,
+            audits: a.audits
+          })));
+        }
+      }
       __privateGet(this, _visited).set(entry.address.toLowerCase(), entry);
       let cnt = 0;
       for (const newEntry of newEntries) {
@@ -346211,6 +346258,14 @@ var require_deploy = __commonJS({
   }
 });
 
+// ../../packages/lib/dist/types/etherscan.js
+var require_etherscan = __commonJS({
+  "../../packages/lib/dist/types/etherscan.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+  }
+});
+
 // ../../packages/lib/dist/types/forge.js
 var require_forge = __commonJS({
   "../../packages/lib/dist/types/forge.js"(exports2) {
@@ -346248,6 +346303,7 @@ var require_types23 = __commonJS({
     __exportStar2(require_commands(), exports2);
     __exportStar2(require_contracts2(), exports2);
     __exportStar2(require_deploy(), exports2);
+    __exportStar2(require_etherscan(), exports2);
     __exportStar2(require_forge(), exports2);
     __exportStar2(require_types22(), exports2);
   }
@@ -365168,7 +365224,7 @@ var require_package3 = __commonJS({
     module2.exports = {
       name: "@gearbox-protocol/deploy-tools",
       description: "Gearbox deploy tools",
-      version: "1.6.0-next.3",
+      version: "1.6.0-next.5",
       homepage: "https://gearbox.fi",
       keywords: [
         "gearbox"
@@ -365350,21 +365406,30 @@ if no options are provided, will verify all pending transactions from safe multi
 }
 
 // src/commands/verify-etherscan.ts
+var import_promises = require("fs/promises");
 var import_deploy_tools_lib4 = __toESM(require_dist10());
 function verifyEtherscan() {
   return new Command().name("verify-etherscan").description(
     "performs bulk verification of gearbox contracts using etherscan"
-  ).addOption(
-    new Option("--etherscan-api-key <key>", "etherscan api key").env(
-      "ETHERSCAN_API_KEY"
-    )
   ).addOption(
     new Option(
       "--addresses-file [json]",
       "json file where keys are addresses to verify, e.g. gearbox contracts tree"
     )
   ).addOption(new Option("--addresses [addr...]", "addresses to verify")).action(async (opts) => {
-    await new import_deploy_tools_lib4.EtherscanVerifier(opts).verify(opts);
+    var _a;
+    if (!((_a = opts.addresses) == null ? void 0 : _a.length) && !opts.addressesFile) {
+      throw new Error("please specify addresses or addresses file");
+    }
+    let addresses = opts.addresses ?? [];
+    if (addresses.length === 0 && opts.addressesFile) {
+      const content = await (0, import_promises.readFile)(opts.addressesFile, "utf-8");
+      addresses = Object.keys(JSON.parse(content));
+    }
+    if (!addresses.length) {
+      throw new Error("no addresses provided");
+    }
+    await new import_deploy_tools_lib4.EtherscanVerifier(opts).verifyMany(addresses);
   });
 }
 
@@ -365397,6 +365462,10 @@ program2.commands.forEach((cmd) => {
     new Option("--multisig <string>", "multisig contract address").default("0xA7D5DDc1b8557914F158076b228AA91eF613f1D5").env("MULTISIG")
   ).addOption(
     new Option("--safe-api <string>", "safe api endpoint").default("https://safe-transaction-mainnet.safe.global").env("SAFE_API")
+  ).addOption(
+    new Option("--etherscan-api-key [key]", "etherscan api key").env(
+      "ETHERSCAN_API_KEY"
+    )
   );
 });
 program2.parse();

package/package.json

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