From 01da4952002a4b5be5271b3e700be50d5dba10ae Mon Sep 17 00:00:00 2001
From: Maurelian <maurelian@protonmail.ch>
Date: Tue, 21 Nov 2023 13:13:59 -0500
Subject: [PATCH] contracts-bedrock: Move modifiers up in Deploy.s.sol
---
.../contracts-bedrock/scripts/Deploy.s.sol | 54 +++++++++----------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/packages/contracts-bedrock/scripts/Deploy.s.sol b/packages/contracts-bedrock/scripts/Deploy.s.sol
index b4ca8356f..b6be742c8 100644
--- a/packages/contracts-bedrock/scripts/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/Deploy.s.sol
@@ -54,6 +54,33 @@ import { Types } from "scripts/Types.sol";
contract Deploy is Deployer {
DeployConfig cfg;
+ /// @notice Modifier that wraps a function in broadcasting.
+ modifier broadcast() {
+ vm.startBroadcast();
+ _;
+ vm.stopBroadcast();
+ }
+
+ /// @notice Modifier that will only allow a function to be called on devnet.
+ modifier onlyDevnet() {
+ uint256 chainid = block.chainid;
+ if (chainid == Chains.LocalDevnet || chainid == Chains.GethDevnet) {
+ _;
+ }
+ }
+
+ /// @notice Modifier that will only allow a function to be called on a public
+ /// testnet or devnet.
+ modifier onlyTestnetOrDevnet() {
+ uint256 chainid = block.chainid;
+ if (
+ chainid == Chains.Goerli || chainid == Chains.Sepolia || chainid == Chains.LocalDevnet
+ || chainid == Chains.GethDevnet
+ ) {
+ _;
+ }
+ }
+
/// @inheritdoc Deployer
function name() public pure override returns (string memory name_) {
name_ = "Deploy";
@@ -102,33 +129,6 @@ contract Deploy is Deployer {
return keccak256(bytes(vm.envOr("IMPL_SALT", string("ethers phoenix"))));
}
- /// @notice Modifier that wraps a function in broadcasting.
- modifier broadcast() {
- vm.startBroadcast();
- _;
- vm.stopBroadcast();
- }
-
- /// @notice Modifier that will only allow a function to be called on devnet.
- modifier onlyDevnet() {
- uint256 chainid = block.chainid;
- if (chainid == Chains.LocalDevnet || chainid == Chains.GethDevnet) {
- _;
- }
- }
-
- /// @notice Modifier that will only allow a function to be called on a public
- /// testnet or devnet.
- modifier onlyTestnetOrDevnet() {
- uint256 chainid = block.chainid;
- if (
- chainid == Chains.Goerli || chainid == Chains.Sepolia || chainid == Chains.LocalDevnet
- || chainid == Chains.GethDevnet
- ) {
- _;
- }
- }
-
/// @notice Deploy all of the proxies
function deployProxies() public {
deployAddressManager();
--
2.23.0