@gearbox-protocol/deploy-tools 1.6.0-next.12 → 1.6.0-next.14

package/dist/index.js

@@ -264191,6 +264191,38 @@ var require_cjs2 = __commonJS({
 var require_EtherscanVerifier = __commonJS({
   "../../packages/lib/dist/EtherscanVerifier.js"(exports2) {
     "use strict";
+    var __createBinding2 = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault2 = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar2 = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding2(result, mod, k);
+      }
+      __setModuleDefault2(result, mod);
+      return result;
+    };
     var __importDefault2 = exports2 && exports2.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
     };
@@ -264199,7 +264231,7 @@ var require_EtherscanVerifier = __commonJS({
     var node_fs_1 = require("fs");
     var promises_1 = require("fs/promises");
     var node_path_1 = __importDefault2(require("path"));
-    var axios_1 = __importDefault2(require_axios());
+    var axios_1 = __importStar2(require_axios());
     var axios_retry_1 = __importDefault2(require_cjs2());
     var log_1 = __importDefault2(require_log());
     var _logger, _etherscanApi, _cacheDir, _cachePolicy, _result, _verify, verify_fn, _getCached, getCached_fn, _saveCached, saveCached_fn;
@@ -264228,22 +264260,23 @@ var require_EtherscanVerifier = __commonJS({
         }));
         __privateGet(this, _etherscanApi).interceptors.response.use(async (response) => {
           var _a, _b, _c;
-          if (response.status === 200 && ((_a = response.data) == null ? void 0 : _a.status) === "0" && ((_c = (_b = response.data) == null ? void 0 : _b.message) == null ? void 0 : _c.startsWith("Max rate"))) {
+          if (response.status === 200 && ((_a = response.data) == null ? void 0 : _a.status) === "0" && ((_c = (_b = response.data) == null ? void 0 : _b.result) == null ? void 0 : _c.startsWith("Max rate"))) {
             response.status = 429;
+            throw new axios_1.AxiosError("maxrate", "429", response.config, response.request, response);
           }
           return response;
         });
         (0, axios_retry_1.default)(__privateGet(this, _etherscanApi), {
           retries: 5,
           retryCondition: (e) => {
-            var _a, _b, _c, _d;
-            __privateGet(this, _logger).trace(`Etherscan error, status ${(_a = e.response) == null ? void 0 : _a.status}, msg: ${(_b = e.response) == null ? void 0 : _b.data}`);
-            if (((_c = e.response) == null ? void 0 : _c.status) === 429) {
+            var _a, _b, _c, _d, _e;
+            __privateGet(this, _logger).trace(`Etherscan error, status ${(_a = e.response) == null ? void 0 : _a.status}, msg: ${(_c = (_b = e.response) == null ? void 0 : _b.data) == null ? void 0 : _c.result}`);
+            if (((_d = e.response) == null ? void 0 : _d.status) === 429) {
               return true;
             }
             try {
-              const resp = (_d = e.response) == null ? void 0 : _d.data;
-              return resp.status === "0" && resp.message.startsWith("Max rate");
+              const resp = (_e = e.response) == null ? void 0 : _e.data;
+              return resp.status === "0" && resp.result.startsWith("Max rate");
             } catch {
             }
             return false;
@@ -264307,11 +264340,6 @@ var require_EtherscanVerifier = __commonJS({
         }
       });
       if (resp.data.status === "0") {
-        __privateGet(this, _logger).trace({
-          data: resp.data,
-          status: resp.status,
-          statusText: resp.statusText
-        });
         throw new Error(`cannot verify address ${address}: ${resp.data.result}`);
       }
       if (resp.data.result.length === 0 || resp.data.result[0].ABI.startsWith("Contract source code not verified")) {
@@ -313868,7 +313896,7 @@ var require_SafeHelper = __commonJS({
     var utils_1 = require_utils33();
     var SIG_EXECUTE = "0x0825f38f";
     var SIG_QUEUE = "0x3a66f901";
-    var _pending, _timelockExecutions, _tenderly, _init, init_fn, _impersonateSafe, impersonateSafe_fn, _validateTransaction, validateTransaction_fn, _validateMultisend, validateMultisend_fn, _validateSingle, validateSingle_fn, _execute, execute_fn, _getTimelockExecute, getTimelockExecute_fn;
+    var _pending, _pairedExecutions, _tenderly, _init, init_fn, _impersonateSafe, impersonateSafe_fn, _validateTransaction, validateTransaction_fn, _validateMultisend, validateMultisend_fn, _validateSingle, validateSingle_fn, _execute, execute_fn, _getPairedExecute, getPairedExecute_fn;
     var _SafeHelper = class _SafeHelper extends SafeBase_1.SafeBase {
       constructor(rpcUrl, options) {
         const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider({
@@ -313898,16 +313926,16 @@ var require_SafeHelper = __commonJS({
          * @param eta
          * @returns
          */
-        __privateAdd(this, _getTimelockExecute);
+        __privateAdd(this, _getPairedExecute);
         __privateAdd(this, _pending, []);
-        __privateAdd(this, _timelockExecutions, []);
+        __privateAdd(this, _pairedExecutions, []);
         __privateAdd(this, _tenderly, void 0);
         __privateSet(this, _tenderly, rpcUrl.includes("tenderly"));
       }
       /**
        * Executes all found pending transactions, returns array of safe tx hashes
        */
-      async run() {
+      async run({ disablePairedExecute, alwaysWarpTime } = {}) {
         if (__privateGet(this, _tenderly)) {
           console.log(chalk_1.default.red("running on tenderly"));
         }
@@ -313918,18 +313946,18 @@ var require_SafeHelper = __commonJS({
           const { timestamp } = await this.provider.getBlock("latest");
           const txInfo = __privateMethod(this, _validateTransaction, validateTransaction_fn).call(this, timestamp, tx);
           const { multisend, isExecute, isQueue, eta } = txInfo;
-          if (isExecute) {
-            hasRealExecute = true;
+          hasRealExecute || (hasRealExecute = isExecute);
+          if (isExecute || alwaysWarpTime) {
             await (0, utils_1.warpTime)(this.provider, eta + 1, __privateGet(this, _tenderly));
           }
           console.log(`Executing ${txType(txInfo)} ${tx.safeTxHash} with nonce ${tx.nonce} and eta ${eta}`);
           await __privateMethod(this, _execute, execute_fn).call(this, tx);
-          if (isQueue) {
-            __privateGet(this, _timelockExecutions).push(await __privateMethod(this, _getTimelockExecute, getTimelockExecute_fn).call(this, tx, multisend, eta));
+          if (isQueue && !disablePairedExecute) {
+            __privateGet(this, _pairedExecutions).push(await __privateMethod(this, _getPairedExecute, getPairedExecute_fn).call(this, tx, multisend, eta));
           }
         }
         if (!hasRealExecute) {
-          for (const tx of __privateGet(this, _timelockExecutions)) {
+          for (const tx of __privateGet(this, _pairedExecutions)) {
             await (0, utils_1.warpTime)(this.provider, tx.eta + 1, __privateGet(this, _tenderly));
             console.log(`Executing fake execute timelock tx with eta ${tx.eta}`);
             await __privateMethod(this, _execute, execute_fn).call(this, tx.tx);
@@ -313939,7 +313967,7 @@ var require_SafeHelper = __commonJS({
       }
     };
     _pending = new WeakMap();
-    _timelockExecutions = new WeakMap();
+    _pairedExecutions = new WeakMap();
     _tenderly = new WeakMap();
     _init = new WeakSet();
     init_fn = async function() {
@@ -314054,8 +314082,18 @@ var require_SafeHelper = __commonJS({
           throw new Error("eta parameter not found");
         }
         const eta = parseInt(data.dataDecoded.parameters[4].value, 10);
-        if (eta <= timestamp) {
-          throw new Error("ETA is outdated");
+        if (isQueue) {
+          if (eta <= timestamp) {
+            throw new Error(`Validation failed: ETA is outdated in ${method} tx: ${eta} <= ${timestamp}`);
+          }
+        } else {
+          if (timestamp < eta) {
+            throw new Error("Validation failed: executeTransaction: Transaction hasn't surpassed time lock.");
+          }
+          const GRACE_PERIOD = 14 * 24 * 60 * 60;
+          if (timestamp > eta + GRACE_PERIOD) {
+            throw new Error("Validation failed: executeTransaction: Transaction is stale");
+          }
         }
         return {
           isQueue,
@@ -314087,8 +314125,8 @@ var require_SafeHelper = __commonJS({
         console.log(`executed safe tx with nonce ${tx.data.nonce}`);
       }
     };
-    _getTimelockExecute = new WeakSet();
-    getTimelockExecute_fn = async function(data, multisend, eta) {
+    _getPairedExecute = new WeakSet();
+    getPairedExecute_fn = async function(data, multisend, eta) {
       let tx;
       if (multisend) {
         tx = await this.safe.createTransaction({
@@ -414721,7 +414759,7 @@ var require_package3 = __commonJS({
     module2.exports = {
       name: "@gearbox-protocol/deploy-tools",
       description: "Gearbox deploy tools",
-      version: "1.6.0-next.11",
+      version: "1.6.0-next.12",
       homepage: "https://gearbox.fi",
       keywords: [
         "gearbox"
@@ -414854,7 +414892,7 @@ function copyMultisig() {
     ).default("http://127.0.0.1:8545").env("DEV_RPC")
   ).action(async ({ rpcUrl, ...safeOptions }) => {
     const safeHelper = new import_lib2.SafeHelper(rpcUrl, safeOptions);
-    const executed = await safeHelper.run();
+    const executed = await safeHelper.run(safeOptions);
     try {
       (0, import_core.exportVariable)("EXECUTED_TRANSACTIONS", executed.join(","));
     } catch (e) {

package/package.json

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