fix: Use updated Base contracts, fixing rollback nonce

base · Jan 29, 2025 · 2c62447 · 2c62447
1 parent 3cf5984
commit 2c62447
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/mainnet/2025-01-29-increase-gas-limit/.env b/mainnet/2025-01-29-increase-gas-limit/.env
@@ -1,5 +1,5 @@
 OP_COMMIT=dff5f16c510e7f44f1be0574372ccb08bfec045c
-BASE_CONTRACTS_COMMIT=1f3ffe844dbff6331801d3d25b5f3c3aa904afc0
+BASE_CONTRACTS_COMMIT=a5c616359d6b53a5cea84ae4943e4cb1938030b3
 
 L1_SYSTEM_CONFIG_ADDRESS=0x73a79Fab69143498Ed3712e519A88a918e1f4072
 SYSTEM_CONFIG_OWNER=0x14536667Cd30e52C0b458BaACcB9faDA7046E056

diff --git a/mainnet/2025-01-29-increase-gas-limit/Makefile b/mainnet/2025-01-29-increase-gas-limit/Makefile
@@ -6,26 +6,38 @@ ifndef LEDGER_ACCOUNT
 override LEDGER_ACCOUNT = 0
 endif
 
+ifndef ROLLBACK_NONCE_OFFSET
+override ROLLBACK_NONCE_OFFSET = 1
+endif
+
 .PHONY: sign-upgrade
 sign-upgrade:
+	FROM_GAS_LIMIT=$(OLD_GAS_LIMIT) \
+	TO_GAS_LIMIT=$(NEW_GAS_LIMIT) \
 	$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
-	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/UpgradeGasLimit.sol \
+	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/SetGasLimit.sol \
 	--sig "sign()"
 
 .PHONY: execute-upgrade
 execute-upgrade:
-	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/UpgradeGasLimit.sol \
+	FROM_GAS_LIMIT=$(OLD_GAS_LIMIT) \
+	TO_GAS_LIMIT=$(NEW_GAS_LIMIT) \
+	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/SetGasLimit.sol \
 	--sig "run(bytes)" $(SIGNATURES) --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast
 
-
 .PHONY: sign-rollback
 sign-rollback:
+	FROM_GAS_LIMIT=$(NEW_GAS_LIMIT) \
+	TO_GAS_LIMIT=$(OLD_GAS_LIMIT) \
+	SAFE_NONCE=$(shell expr $$(cast call $(SYSTEM_CONFIG_OWNER) "nonce()" --rpc-url $(L1_RPC_URL) | cast to-dec) + $(ROLLBACK_NONCE_OFFSET)) \
 	$(GOPATH)/bin/eip712sign --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" -- \
-	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/RollbackGasLimit.sol \
+	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/SetGasLimit.sol \
 	--sig "sign()"
 
-
 .PHONY: execute-rollback
 execute-rollback:
-	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/RollbackGasLimit.sol \
+	FROM_GAS_LIMIT=$(NEW_GAS_LIMIT) \
+	TO_GAS_LIMIT=$(OLD_GAS_LIMIT) \
+	SAFE_NONCE=$(shell expr $$(cast call $(SYSTEM_CONFIG_OWNER) "nonce()" --rpc-url $(L1_RPC_URL) | cast to-dec) + $(ROLLBACK_NONCE_OFFSET)) \
+	forge script --rpc-url $(L1_RPC_URL) lib/base-contracts/script/deploy/l1/SetGasLimit.sol \
 	--sig "run(bytes)" $(SIGNATURES) --ledger --hd-paths "m/44'/60'/$(LEDGER_ACCOUNT)'/0/0" --broadcast