feat: improve safe nonce management

Author: kasperpawlowski

script/50_CoreAndPeriphery.s.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.0;
 
 import {BatchBuilder, Vm, console} from "./utils/ScriptUtils.s.sol";
-import {SafeMultisendBuilder, SafeTransaction, SafeUtil} from "./utils/SafeUtils.s.sol";
+import {SafeMultisendBuilder, SafeTransaction} from "./utils/SafeUtils.s.sol";
 import {LayerZeroUtil} from "./utils/LayerZeroUtils.s.sol";
 import {ERC20BurnableMintableDeployer, RewardTokenDeployer} from "./00_ERC20.s.sol";
 import {Integrations} from "./01_Integrations.s.sol";
@@ -1030,14 +1030,7 @@ contract CoreAndPeriphery is BatchBuilder, SafeMultisendBuilder {
         executeBatch();
 
         if (multisendItemExists()) {
-            address safe = getSafe();
-
-            if (safeNonce == 0) {
-                SafeUtil util = new SafeUtil();
-                safeNonce = util.getNextNonce(safe);
-            }
-
-            executeMultisend(safe, safeNonce++);
+            executeMultisend(getSafe(), safeNonce++);
         }
 
         saveAddresses();

script/utils/ScriptUtils.s.sol

@@ -18,7 +18,7 @@ import {AmountCap, AmountCapLib} from "evk/EVault/shared/types/AmountCap.sol";
 import {IEVC} from "ethereum-vault-connector/interfaces/IEthereumVaultConnector.sol";
 import {IEVault, IGovernance} from "evk/EVault/IEVault.sol";
 import {EulerRouter, Governable} from "euler-price-oracle/EulerRouter.sol";
-import {SafeTransaction} from "./SafeUtils.s.sol";
+import {SafeTransaction, SafeUtil} from "./SafeUtils.s.sol";
 import {BaseFactory} from "../../src/BaseFactory/BaseFactory.sol";
 import {SnapshotRegistry} from "../../src/SnapshotRegistry/SnapshotRegistry.sol";
 import {BasePerspective} from "../../src/Perspectives/implementation/BasePerspective.sol";
@@ -407,7 +407,7 @@ abstract contract ScriptUtils is
     TokenAddresses internal tokenAddresses;
     GovernorAddresses internal governorAddresses;
     EulerSwapAddresses internal eulerSwapAddresses;
-    uint256 internal safeNonce = getSafeNonce();
+    uint256 internal safeNonce;
 
     constructor() {
         multisigAddresses = deserializeMultisigAddresses(getAddressesJson("MultisigAddresses.json"));
@@ -419,6 +419,12 @@ abstract contract ScriptUtils is
         governorAddresses = deserializeGovernorAddresses(getAddressesJson("GovernorAddresses.json"));
         eulerSwapAddresses = deserializeEulerSwapAddresses(getAddressesJson("EulerSwapAddresses.json"));
         deserializeBridgeConfigCache(getBridgeConfigCacheJson("BridgeConfigCache.json"));
+
+        safeNonce = getSafeNonce();
+        if (safeNonce == 0) {
+            SafeUtil util = new SafeUtil();
+            safeNonce = util.getNextNonce(getSafe());
+        }
     }
 
     modifier broadcast() {
@@ -944,8 +950,6 @@ abstract contract BatchBuilder is ScriptUtils {
 
         dumpBatch(safe);
 
-        safeNonce = safeNonce == 0 ? transaction.getNextNonce(safe) : safeNonce;
-
         if (timelock == address(0) || !allowTimelock) {
             console.log("Executing the batch via Safe (%s) using the EVC (%s)\n", safe, coreAddresses.evc);
             transaction.create(true, safe, coreAddresses.evc, getBatchValue(), getBatchCalldata(), safeNonce++);