diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
+
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
index 363d7e50615c69d3823aa3a451d4439ec37f10c5..2a3fa8da6d63595f6bd81ac58b503482e9a6e102 100644
--- hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
+++ optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
@@ -6222,7 +6222,7 @@
-
+
Deploys Create2 Deployer Contract
@@ -6244,7 +6244,7 @@
-
+
The Create2 Deployer contract is used to deploy contracts to the L2.
It is used by the sequencer to deploy the sequencer contract.
@@ -6253,8 +6253,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/Create2DeployerFunction.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/Create2DeployerFunction.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/Create2DeployerFunction.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/Create2DeployerFunction.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e4ee5769a62bae076f47bec57908115383c81de
--- /dev/null
@@ -6371,7 +6371,7 @@
-
+
Chain Configuration
@@ -6393,7 +6393,7 @@
-
+
@@ -6401,7 +6401,7 @@
-
+
Chain config
@@ -6423,7 +6423,7 @@
-
+
The rollup functionality is enabled with the optimism
field in the chain config.
The EIP-1559 parameters are configurable to adjust for faster more frequent and smaller blocks.
The parameters can be overriden for testing.
@@ -6433,8 +6433,8 @@
-
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
+
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
index 8e47af3b753656ede76caf139ae4777c8f75aee5..1a30a54fb0baaeec6b96594d5b3ce278c9d28172 100644
--- hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
+++ optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
@@ -6603,8 +6603,8 @@
-
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
+
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
index d5635d9ae378807ef084bb37cb2e0afd80d43a03..63fd32899e3d4f012db0f629eb890d85ba6eded1 100644
--- hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
+++ optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -6822,8 +6822,8 @@
-
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/OptimismConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/OptimismConfigOptions.java
+
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/OptimismConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/OptimismConfigOptions.java
new file mode 100644
index 0000000000000000000000000000000000000000..912207c881b7e2a55e5bb06509d19b39a5e99191
--- /dev/null
@@ -6963,7 +6963,7 @@
-
+
Node Configuration
@@ -6985,7 +6985,7 @@
-
+
@@ -6993,7 +6993,7 @@
-
+
Controller modifications
@@ -7015,7 +7015,7 @@
-
+
Changes to the node configuration and services.
@@ -7023,8 +7023,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
index 6942fda3166451c72b30d4fb864f6fa4b2e00a63..6497050d706d66f222ffe6515b1a71d29b6bc660 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
@@ -7120,8 +7120,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
index e391f920ceb0b4f2dfb6bed255516ab8656aed68..0e579f573429dc280ca3e94bcb06660a491b1046 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
@@ -7210,7 +7210,7 @@
-
+
Spec Builder
@@ -7232,7 +7232,7 @@
-
+
The Spec Builder is extended to support the new transaction type and the new EIP-1559 parameters for the optimism
.
@@ -7240,8 +7240,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
index 7575c7fe3142bfd95895fd4da2a59c1d5a1f928a..40c11adc162b2a2348efa5424126a0b9fa60e749 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
@@ -7294,8 +7294,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
index 16fee28bb50442c7d56e47fb3b826d586138b43d..4a618452d309e5f009e3c108500df3e6bd63a392 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
@@ -7575,8 +7575,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
index 78198922ea40f42285f1ad2b181ebac8d00cf0e5..f3f8b45d98d84f1108840761f62edde41b52fbf6 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
@@ -7634,8 +7634,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
index f79c6a874bbb7de8d444f0f6b5e63dfe5f1d04b1..1595a8785036198627c84e6ff0b48711d7a93256 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
@@ -7751,7 +7751,7 @@
-
+
Other changes
@@ -7773,15 +7773,15 @@
-
+
-
diff --git hyperledger/besu/.github/config/configuration.json optimism-java/op-besu/.github/config/configuration.json
+
diff --git hyperledger/besu/.github/config/configuration.json optimism-java/op-besu/.github/config/configuration.json
new file mode 100644
index 0000000000000000000000000000000000000000..09df5f7dae988691718ea209a7cf0d45b8c1928f
--- /dev/null
@@ -7891,8 +7891,8 @@
-
diff --git hyperledger/besu/.github/workflows/pages.yaml optimism-java/op-besu/.github/workflows/pages.yaml
+
diff --git hyperledger/besu/.github/workflows/pages.yaml optimism-java/op-besu/.github/workflows/pages.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7e204ae09f0134e74c164987c4012a6ac159e7b6
--- /dev/null
@@ -7973,8 +7973,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
index 9e612fea3b2413b546feda293d036b11643de400..32e0d2886998481c7a7c955e154ac1a20640c2c0 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -8033,8 +8033,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
index dd5e43e63febc1115568c149d3934c558b90f38a..767b7cd6e529e5c1bc4b3884d6becc7865ad4b94 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
@@ -8144,8 +8144,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
index bd41015a7a19b5cdb7ed350bc61b9c41c8a362ee..fc397c1da54dde094843527af31183b856e8ebba 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
@@ -8201,8 +8201,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
index aab0000592fca16d2396593aea09ca2da2791fc7..9ef74b86ecbb2fbed3090596d7f04ae3e46a1970 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -8264,8 +8264,8 @@
-
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
+
diff --git hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
index a2f52c90ee4f462a207be6f3cf2d7ce66088698a..c50bae0a8f661901cb6944f59b9c57698dc86467 100644
--- hyperledger/besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
+++ optimism-java/op-besu/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
@@ -8330,8 +8330,8 @@
-
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
+
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
index f6c6aac5f2fa885b2b4ddf3b076f032da8d505d5..a86afee88294b832cbfbab898c14c6c60b0f22b2 100644
--- hyperledger/besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
+++ optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
@@ -8390,8 +8390,8 @@
-
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
+
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
index 1e8d15cdb4fffaa736b32dbf1c3b618556971093..3af8878e9ebeb32825b8765c760601bb887c5799 100644
--- hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
+++ optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -8450,8 +8450,8 @@
-
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java
+
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java
index c2e26344a0b10e8479da5fc251a7dd66460021f2..045ccd42b097433d0bfe462a3f5d0b77fd06e1c5 100644
--- hyperledger/besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java
+++ optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/cli/CascadingDefaultProviderTest.java
@@ -8510,8 +8510,8 @@
-
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
+
diff --git hyperledger/besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
index 3673e78e312683dae147e1f9461d25147a5da4a5..14a9975e126c3f4ab266230379a3736e8e0c78ec 100644
--- hyperledger/besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
+++ optimism-java/op-besu/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
@@ -8571,8 +8571,8 @@
-
diff --git hyperledger/besu/build.gradle optimism-java/op-besu/build.gradle
+
diff --git hyperledger/besu/build.gradle optimism-java/op-besu/build.gradle
index b26f36b51945e920fc59bef03aa6724e8369ff13..feecfa88d4632592cc742c85cbcd29bf3df3fc50 100644
--- hyperledger/besu/build.gradle
+++ optimism-java/op-besu/build.gradle
@@ -8879,8 +8879,8 @@
-
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
+
diff --git hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
index 32800f58a12d2076cc8081e119c16230643f2fd6..52f1308b6a6327d9c92518fa1fef69a03728ac65 100644
--- hyperledger/besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
+++ optimism-java/op-besu/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
@@ -9100,8 +9100,8 @@
-
diff --git hyperledger/besu/config/src/main/resources/optimism-mainnet.json optimism-java/op-besu/config/src/main/resources/optimism-mainnet.json
+
diff --git hyperledger/besu/config/src/main/resources/optimism-mainnet.json optimism-java/op-besu/config/src/main/resources/optimism-mainnet.json
new file mode 100644
index 0000000000000000000000000000000000000000..f96a7ba9b7ae5d464437a9528b2f219076b6ee6a
--- /dev/null
@@ -9199,8 +9199,8 @@
-
diff --git hyperledger/besu/consensus/merge/build.gradle optimism-java/op-besu/consensus/merge/build.gradle
+
diff --git hyperledger/besu/consensus/merge/build.gradle optimism-java/op-besu/consensus/merge/build.gradle
index 9476f09d9d7ec51d760a73710e38ddbcf9e0d7c3..c1559ceade1ee52a72025333eb934a74782d0b69 100644
--- hyperledger/besu/consensus/merge/build.gradle
+++ optimism-java/op-besu/consensus/merge/build.gradle
@@ -9251,8 +9251,8 @@
-
diff --git hyperledger/besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java optimism-java/op-besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
+
diff --git hyperledger/besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java optimism-java/op-besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
index 6ce8bcd8d0a9bf69b2e27339ad9d563b52733d7c..95b8a727ac393f35ec897365aa11112519fe7398 100644
--- hyperledger/besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
+++ optimism-java/op-besu/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
@@ -9435,8 +9435,8 @@
-
diff --git hyperledger/besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java optimism-java/op-besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
+
diff --git hyperledger/besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java optimism-java/op-besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
index bea562ee1f4dceb5cdbd6788f64da793a5e76cd1..f59f37a6efa67ff9d6ecc0f77da3e9983b691f03 100644
--- hyperledger/besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
+++ optimism-java/op-besu/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
@@ -9511,8 +9511,8 @@
-
diff --git hyperledger/besu/datatypes/src/test/java/org/hyperledger/besu/datatypes/RollupGasDataTest.java optimism-java/op-besu/datatypes/src/test/java/org/hyperledger/besu/datatypes/RollupGasDataTest.java
+
diff --git hyperledger/besu/datatypes/src/test/java/org/hyperledger/besu/datatypes/RollupGasDataTest.java optimism-java/op-besu/datatypes/src/test/java/org/hyperledger/besu/datatypes/RollupGasDataTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..db6b1a2963990befa7ce7b36fb8f34cc6e4aa2f2
--- /dev/null
@@ -9619,8 +9619,8 @@
-
diff --git hyperledger/besu/docker/.gitignore optimism-java/op-besu/docker/.gitignore
+
diff --git hyperledger/besu/docker/.gitignore optimism-java/op-besu/docker/.gitignore
index f66d61166c1791110d69bbe94818838507f80afb..3c24e26df4ddcdae119a22f18a76bca4d7a1fa55 100644
--- hyperledger/besu/docker/.gitignore
+++ optimism-java/op-besu/docker/.gitignore
@@ -9671,8 +9671,8 @@
-
diff --git hyperledger/besu/docker/Dockerfile optimism-java/op-besu/docker/Dockerfile
+
diff --git hyperledger/besu/docker/Dockerfile optimism-java/op-besu/docker/Dockerfile
index ee138afca62c15e4c515e838c0f65421f2e15a62..9ccb7db97d47d0bc44d000b249465340c62043dc 100644
--- hyperledger/besu/docker/Dockerfile
+++ optimism-java/op-besu/docker/Dockerfile
@@ -9741,8 +9741,8 @@
-
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
+
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
index 1f1b19d88a1a675c07e520937611e8ccbd5ac915..32101db326bb5dd1f09aeb7595503945e12dfb8d 100644
--- hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
+++ optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV3.java
@@ -9826,8 +9826,8 @@
-
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
+
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
index 16b683ed712d5c3da451305808783a6917188697..dfa07f3bee5fbd267c3139123c6eddbbede131fa 100644
--- hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
+++ optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
@@ -9896,8 +9896,8 @@
-
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
+
diff --git hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
index 50318b5ac155cfdf2a072e8f326a1b0ef13990bf..a93cd7cef9c7dc1fb64fe3b802d7ad79548470ad 100644
--- hyperledger/besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
+++ optimism-java/op-besu/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
@@ -9989,8 +9989,8 @@
-
diff --git hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
+
diff --git hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
index 4cb4c81cc9e872c69474b3ebbe3f27362e19ddbe..b267bc368747d104533cf0d2db94f3acd400f93e 100644
--- hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
+++ optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
@@ -10187,8 +10187,8 @@
-
diff --git hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
+
diff --git hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
index bec9bd1214340b7e3903a7b7fd0b0eebefc4114a..a4e1350eef9a958f0f9d4b8fc4c82e0152057eac 100644
--- hyperledger/besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
+++ optimism-java/op-besu/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
@@ -10261,8 +10261,8 @@
-
diff --git hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
+
diff --git hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
index 856bf874b201cef7dd12fb0b78334be9176670a5..05c886e3d651218b23f0ec6b9e538beead2d07d2 100644
--- hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
+++ optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
@@ -10393,8 +10393,8 @@
-
diff --git hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
+
diff --git hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
index d70589ae832983a00f95d5f4d70fb8ffb3718302..88016746be28f3182486690794c8ef76a5ca8a36 100644
--- hyperledger/besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
+++ optimism-java/op-besu/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -10447,8 +10447,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
index abee2a5dcb4579fd97da5861fbc16391b8f73a18..90bbd1a9134bf25c5712c958b0a49674089f8f9f 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
@@ -10513,8 +10513,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
index 095a85ef53fcae270a7dee45d8412a87c105f383..9f449b34b34cd27884fde02303aaebd304acd5e2 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
@@ -10575,8 +10575,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
index 2adda62054bf6ef0cef967d355043d9963555069..bec9c6c6d90f53c139d3256f73891c25950117e2 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
@@ -10628,8 +10628,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
+
diff --git hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
index 73d5c54b3484dead30a0ab7700673685035140b7..449a3ff36e396bff37f0b456a88866216466e874 100644
--- hyperledger/besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
+++ optimism-java/op-besu/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
@@ -10683,8 +10683,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
+
diff --git hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
index c5b797403a8d3e8e4b5ac9b6733cb872c368a224..b3030966fee25b36d00b98e08c1047776184011f 100644
--- hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
+++ optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
@@ -10756,8 +10756,8 @@
-
diff --git hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
+
diff --git hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
index d016b7f4e5e1297e4a835892c5d518e10c3496ff..3f39dc4e2609b43cd2a3ad83b1600342a8a81b0d 100644
--- hyperledger/besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
+++ optimism-java/op-besu/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
@@ -10820,8 +10820,8 @@