fix: safe nonce derivation

kasperpawlowski · kasperpawlowski · commit 63b2114a6b70 · 2025-07-02T12:37:36.000+02:00
diff --git a/script/utils/ScriptUtils.s.sol b/script/utils/ScriptUtils.s.sol
@@ -420,10 +420,11 @@ abstract contract ScriptUtils is
         eulerSwapAddresses = deserializeEulerSwapAddresses(getAddressesJson("EulerSwapAddresses.json"));
         deserializeBridgeConfigCache(getBridgeConfigCacheJson("BridgeConfigCache.json"));
 
+        address safe = getSafe(false);
         safeNonce = getSafeNonce();
-        if (safeNonce == 0) {
+        if (safe != address(0) && safeNonce == 0) {
             SafeUtil util = new SafeUtil();
-            safeNonce = util.getNextNonce(getSafe());
+            safeNonce = util.getNextNonce(safe);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -420,10 +420,11 @@ abstract contract ScriptUtils is`
`420`	`420`	`eulerSwapAddresses = deserializeEulerSwapAddresses(getAddressesJson("EulerSwapAddresses.json"));`
`421`	`421`	`deserializeBridgeConfigCache(getBridgeConfigCacheJson("BridgeConfigCache.json"));`
`422`	`422`
	`423`	`+ address safe = getSafe(false);`
`423`	`424`	`safeNonce = getSafeNonce();`
`424`		`- if (safeNonce == 0) {`
	`425`	`+ if (safe != address(0) && safeNonce == 0) {`
`425`	`426`	`SafeUtil util = new SafeUtil();`
`426`		`- safeNonce = util.getNextNonce(getSafe());`
	`427`	`+ safeNonce = util.getNextNonce(safe);`
`427`	`428`	`}`
`428`	`429`	`}`
`429`	`430`