chore: refactor to use _getSaltOrZero() when needed

alchemyplatform · Dec 11, 2024 · 209ed33 · 209ed33
1 parent 63b4c96
commit 209ed33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/script/DeployFactory.s.sol b/script/DeployFactory.s.sol
@@ -42,7 +42,7 @@ contract DeployFactoryScript is ScriptBase, Artifacts {
 
         // Load the expected address and salt from env vars.
         expectedFactoryAddr = vm.envOr("ACCOUNT_FACTORY", address(0));
-        factorySalt = vm.envOr("ACCOUNT_FACTORY_SALT", uint256(0));
+        factorySalt = _getSaltOrZero("ACCOUNT_FACTORY");
     }
 
     function run() public onlyProfile("optimized-build") {

diff --git a/script/PredictAddresses.s.sol b/script/PredictAddresses.s.sol
@@ -45,13 +45,13 @@ contract PredictAddressScript is ScriptBase, Artifacts {
     function setUp() public {
         // Load the salts from env vars.
 
-        allowlistModuleSalt = vm.envOr("ALLOWLIST_MODULE_SALT", uint256(0));
-        nativeTokenLimitModuleSalt = vm.envOr("NATIVE_TOKEN_LIMIT_MODULE_SALT", uint256(0));
-        paymasterGuardModuleSalt = vm.envOr("PAYMASTER_GUARD_MODULE_SALT", uint256(0));
-        singleSignerValidationModuleSalt = vm.envOr("SINGLE_SIGNER_VALIDATION_MODULE_SALT", uint256(0));
-        timeRangeModuleSalt = vm.envOr("TIME_RANGE_MODULE_SALT", uint256(0));
-        webAuthnValidationModuleSalt = vm.envOr("WEBAUTHN_VALIDATION_MODULE_SALT", uint256(0));
-        factorySalt = vm.envOr("ACCOUNT_FACTORY_SALT", uint256(0));
+        allowlistModuleSalt = _getSaltOrZero("ALLOWLIST_MODULE");
+        nativeTokenLimitModuleSalt = _getSaltOrZero("NATIVE_TOKEN_LIMIT_MODULE");
+        paymasterGuardModuleSalt = _getSaltOrZero("PAYMASTER_GUARD_MODULE");
+        singleSignerValidationModuleSalt = _getSaltOrZero("SINGLE_SIGNER_VALIDATION_MODULE");
+        timeRangeModuleSalt = _getSaltOrZero("TIME_RANGE_MODULE");
+        webAuthnValidationModuleSalt = _getSaltOrZero("WEBAUTHN_VALIDATION_MODULE");
+        factorySalt = _getSaltOrZero("ACCOUNT_FACTORY");
         executionInstallDelegateSalt = _getSaltOrZero("EXECUTION_INSTALL_DELEGATE");
         modularAccountImplSalt = _getSaltOrZero("MODULAR_ACCOUNT_IMPL");
         semiModularAccountBytecodeImplSalt = _getSaltOrZero("SEMI_MODULAR_ACCOUNT_BYTECODE_IMPL");