@gearbox-protocol/deploy-tools 1.6.0-next.13 → 1.6.0-next.15

package/dist/index.js

@@ -313896,14 +313896,15 @@ 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) {
+      constructor(options) {
+        const { multisig, safeApi, rpcURL } = options;
         const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider({
-          url: rpcUrl,
+          url: rpcURL,
           timeout: 3e5
         });
-        super(provider, options);
+        super(provider, { multisig, safeApi });
         __privateAdd(this, _init);
         /**
          * Impersonates safe and:
@@ -313926,16 +313927,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"));
+        __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"));
         }
@@ -313946,18 +313947,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);
@@ -313967,7 +313968,7 @@ var require_SafeHelper = __commonJS({
       }
     };
     _pending = new WeakMap();
-    _timelockExecutions = new WeakMap();
+    _pairedExecutions = new WeakMap();
     _tenderly = new WeakMap();
     _init = new WeakSet();
     init_fn = async function() {
@@ -314082,8 +314083,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,
@@ -314115,8 +314126,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({
@@ -369191,7 +369202,7 @@ var require_GearboxAddressTree = __commonJS({
         __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, _provider, new ethers_1.ethers.providers.StaticJsonRpcProvider(options.rpcURL));
         __privateSet(this, _outFile, node_path_1.default.resolve(options.sandboxDir, "tree.json"));
         __privateSet(this, _etherscan, new EtherscanVerifier_1.EtherscanVerifier(options));
         __privateSet(this, _verifier, new Verifier_1.default());
@@ -373759,7 +373770,7 @@ var require_UpdateParser = __commonJS({
     var _logger, _output2, _parseSafeTxHashes, parseSafeTxHashes_fn, _parseBatchAndMeta, parseBatchAndMeta_fn, _parseNormalizedBatch, parseNormalizedBatch_fn, _parseNormalizedTx, parseNormalizedTx_fn, _collectCreate2Addresses, collectCreate2Addresses_fn;
     var UpdateParser2 = class extends SafeBase_1.SafeBase {
       constructor(opts) {
-        const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider(opts.mainnetRpc);
+        const provider = new ethers_1.ethers.providers.StaticJsonRpcProvider(opts.rpcURL);
         super(provider, opts);
         __privateAdd(this, _parseSafeTxHashes);
         __privateAdd(this, _parseBatchAndMeta);
@@ -414749,7 +414760,7 @@ var require_package3 = __commonJS({
     module2.exports = {
       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"
@@ -414877,19 +414888,26 @@ function copyMultisig() {
     "Copies transactions from safe multisig to anvil (or tenderly) fork using multisig impersonation"
   ).addOption(
     new Option(
-      "--rpc-url <string>",
-      "Anvil fork rpc url (or tenderly fork url)"
-    ).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();
-    try {
-      (0, import_core.exportVariable)("EXECUTED_TRANSACTIONS", executed.join(","));
-    } catch (e) {
-      console.warn(`Failed to set EXECUTED_TRANSACTIONS: ${e}`);
+      "--disable-paired-execute",
+      "Disable creation and  execution of paired executeTrransaction for timelock.queueTransaction"
+    )
+  ).addOption(
+    new Option(
+      "--always-warp-time",
+      "Warp time even after queueTransactions"
+    )
+  ).action(
+    async (options) => {
+      const safeHelper = new import_lib2.SafeHelper(options);
+      const executed = await safeHelper.run(options);
+      try {
+        (0, import_core.exportVariable)("EXECUTED_TRANSACTIONS", executed.join(","));
+      } catch (e) {
+        console.warn(`Failed to set EXECUTED_TRANSACTIONS: ${e}`);
+      }
+      console.log("done");
     }
-    console.log("done");
-  });
+  );
 }
 
 // src/commands/parse.ts
@@ -416025,10 +416043,7 @@ program2.addCommand(verifyEtherscan());
 program2.addCommand(parse2());
 program2.commands.forEach((cmd) => {
   cmd.addOption(
-    new Option(
-      "--mainnet-rpc <url>",
-      "mainnet rpc provider, used by safe api"
-    ).default("https://rpc.ankr.com/eth").env("MAINNET_RPC_URL")
+    new Option("--rpc-url <url>", "rpc provider url").default("https://rpc.ankr.com/eth").env("RPC_URL")
   ).addOption(
     new Option(
       "--cache-policy [never|only]",

package/package.json

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