From cd6f2aacbd893dc516696cc3a6442c6ccea9aacb Mon Sep 17 00:00:00 2001 From: Jack Chuma Date: Fri, 13 Mar 2026 07:35:32 -0400 Subject: [PATCH] clean up mentions of OP_COMMIT --- README.md | 2 +- setup-templates/template-funding/Makefile | 1 - setup-templates/template-gas-and-elasticity-increase/Makefile | 1 - setup-templates/template-gas-increase/Makefile | 1 - setup-templates/template-generic/Makefile | 3 +-- setup-templates/template-generic/README.md | 1 - setup-templates/template-pause-bridge-base/Makefile | 1 - setup-templates/template-safe-management/Makefile | 1 - setup-templates/template-set-bridge-partner-threshold/Makefile | 1 - setup-templates/template-switch-to-permissioned-game/Makefile | 1 - setup-templates/template-upgrade-fault-proofs/Makefile | 1 - 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 566a462e..ccf81fae 100644 --- a/README.md +++ b/README.md @@ -316,7 +316,7 @@ This template is used to pause or un-pause the L1 SuperchainConfig contract. 1. Ensure you have followed the instructions above in `setup`. 1. Run `make setup-superchain-config-pause network=` and go to the folder that was created by this command. -1. Specify the commit of [Optimism code](https://github.com/ethereum-optimism/optimism) and [Base contracts code](https://github.com/base/contracts) you intend to use in the `.env` file. +1. Specify the commit of [Base contracts code](https://github.com/base/contracts) you intend to use in the `.env` file. 1. Run `make deps`. 1. Fill in any task-specific variables in the `.env` file that have per-network comments, using the value for your target network. 1. Build the contracts with `forge build`. diff --git a/setup-templates/template-funding/Makefile b/setup-templates/template-funding/Makefile index 7b991b3a..bd95485f 100644 --- a/setup-templates/template-funding/Makefile +++ b/setup-templates/template-funding/Makefile @@ -9,7 +9,6 @@ SCRIPT_NAME = FundScript # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(SENDER)" || (echo "SENDER required" && exit 1) diff --git a/setup-templates/template-gas-and-elasticity-increase/Makefile b/setup-templates/template-gas-and-elasticity-increase/Makefile index 9b100074..5fdab7a4 100644 --- a/setup-templates/template-gas-and-elasticity-increase/Makefile +++ b/setup-templates/template-gas-and-elasticity-increase/Makefile @@ -16,7 +16,6 @@ SCRIPT_NAME = IncreaseEip1559ElasticityAndIncreaseGasLimitScript # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" -a "$(OP_COMMIT)" != "TODO" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" -a "$(BASE_CONTRACTS_COMMIT)" != "TODO" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(SYSTEM_CONFIG)" || (echo "SYSTEM_CONFIG required" && exit 1) diff --git a/setup-templates/template-gas-increase/Makefile b/setup-templates/template-gas-increase/Makefile index 070e8a80..7138f807 100644 --- a/setup-templates/template-gas-increase/Makefile +++ b/setup-templates/template-gas-increase/Makefile @@ -18,7 +18,6 @@ SCRIPT_NAME = lib/base-contracts/script/deploy/l1/SetGasLimit.sol # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" -a "$(OP_COMMIT)" != "TODO" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" -a "$(BASE_CONTRACTS_COMMIT)" != "TODO" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(L1_SYSTEM_CONFIG_ADDRESS)" || (echo "L1_SYSTEM_CONFIG_ADDRESS required" && exit 1) @test -n "$(SYSTEM_CONFIG_OWNER)" || (echo "SYSTEM_CONFIG_OWNER required" && exit 1) diff --git a/setup-templates/template-generic/Makefile b/setup-templates/template-generic/Makefile index b2d279db..d119337e 100644 --- a/setup-templates/template-generic/Makefile +++ b/setup-templates/template-generic/Makefile @@ -9,7 +9,6 @@ SCRIPT_NAME = ExampleMultisigScript # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" -a "$(OWNER_SAFE)" != "" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(TARGET)" -a "$(TARGET)" != "" || (echo "TARGET required" && exit 1) @@ -28,4 +27,4 @@ approve-l1-1: # Execute .PHONY: execute execute: validate-config - $(call MULTISIG_EXECUTE,0x) \ No newline at end of file + $(call MULTISIG_EXECUTE,0x) diff --git a/setup-templates/template-generic/README.md b/setup-templates/template-generic/README.md index eaa34090..678154ca 100644 --- a/setup-templates/template-generic/README.md +++ b/setup-templates/template-generic/README.md @@ -33,7 +33,6 @@ Edit `.env` and set all required variables: | Variable | Required | Description | |----------|----------|-------------| -| `OP_COMMIT` | Yes | Git commit hash for ethereum-optimism/optimism | | `BASE_CONTRACTS_COMMIT` | Yes | Git commit hash for base/contracts | | `TARGET` | Yes | Target contract address for the operation | | `OWNER_SAFE` | Yes | Top-level Gnosis Safe address | diff --git a/setup-templates/template-pause-bridge-base/Makefile b/setup-templates/template-pause-bridge-base/Makefile index a6e13120..d0cce7a5 100644 --- a/setup-templates/template-pause-bridge-base/Makefile +++ b/setup-templates/template-pause-bridge-base/Makefile @@ -20,7 +20,6 @@ SCRIPT_NAME = PauseBridge # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(L1_PORTAL)" || (echo "L1_PORTAL required" && exit 1) diff --git a/setup-templates/template-safe-management/Makefile b/setup-templates/template-safe-management/Makefile index bd96ed3d..2b74b434 100644 --- a/setup-templates/template-safe-management/Makefile +++ b/setup-templates/template-safe-management/Makefile @@ -9,7 +9,6 @@ SCRIPT_NAME = UpdateSigners # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" -a "$(OP_COMMIT)" != "TODO" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" -a "$(BASE_CONTRACTS_COMMIT)" != "TODO" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" -a "$(OWNER_SAFE)" != "TODO" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(SENDER)" -a "$(SENDER)" != "TODO" || (echo "SENDER required" && exit 1) diff --git a/setup-templates/template-set-bridge-partner-threshold/Makefile b/setup-templates/template-set-bridge-partner-threshold/Makefile index 3cd7c951..e5acc08d 100644 --- a/setup-templates/template-set-bridge-partner-threshold/Makefile +++ b/setup-templates/template-set-bridge-partner-threshold/Makefile @@ -13,7 +13,6 @@ SCRIPT_NAME = SetThreshold # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(L1_PORTAL)" || (echo "L1_PORTAL required" && exit 1) diff --git a/setup-templates/template-switch-to-permissioned-game/Makefile b/setup-templates/template-switch-to-permissioned-game/Makefile index c73a744d..df5d3940 100644 --- a/setup-templates/template-switch-to-permissioned-game/Makefile +++ b/setup-templates/template-switch-to-permissioned-game/Makefile @@ -9,7 +9,6 @@ SCRIPT_NAME = SwitchToPermissionedGame # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(OWNER_SAFE)" || (echo "OWNER_SAFE required" && exit 1) @test -n "$(SYSTEM_CONFIG)" || (echo "SYSTEM_CONFIG required" && exit 1) diff --git a/setup-templates/template-upgrade-fault-proofs/Makefile b/setup-templates/template-upgrade-fault-proofs/Makefile index 0ee79d0a..e7b0268e 100644 --- a/setup-templates/template-upgrade-fault-proofs/Makefile +++ b/setup-templates/template-upgrade-fault-proofs/Makefile @@ -12,7 +12,6 @@ OP_SIGNER_SAFE_ADDR ?= $(OP_MULTISIG) # Validate required configuration before execution .PHONY: validate-config validate-config: - @test -n "$(OP_COMMIT)" || (echo "OP_COMMIT required" && exit 1) @test -n "$(BASE_CONTRACTS_COMMIT)" || (echo "BASE_CONTRACTS_COMMIT required" && exit 1) @test -n "$(ABSOLUTE_PRESTATE)" || (echo "ABSOLUTE_PRESTATE required" && exit 1) @test -n "$(SYSTEM_CONFIG)" || (echo "SYSTEM_CONFIG required" && exit 1)