clean merge

Signed-off-by: Karim Taam <[email protected]>
hyperledger · Oct 30, 2024 · 0866781 · 0866781
2 parents dbf6333 + f82bb7d
commit 0866781
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
@@ -38,7 +38,7 @@ public enum NetworkName {
    */
   EPHEMERY("/ephemery.json", BigInteger.valueOf(39438135)),
 
-  /** Verkle testnet */
+  /** Verkle kaustinen testnet */
   KAUSTINEN("/kaustinen.json", BigInteger.valueOf(69420)),
 
   /** Dev network name. */

diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -1118,9 +1118,9 @@ yield new VerkleWorldStateProvider(
             worldStateKeyValueStorage,
             blockchain,
             Optional.of(
-                    dataStorageConfiguration
-                            .getDiffBasedSubStorageConfiguration()
-                            .getMaxLayersToLoad()),
+                dataStorageConfiguration
+                    .getDiffBasedSubStorageConfiguration()
+                    .getMaxLayersToLoad()),
             besuComponent.map(BesuComponent::getBesuPluginContext).orElse(null),
             evmConfiguration);
       }

diff --git a/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV6800.java b/.../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV6800.java
@@ -51,10 +51,10 @@ public String getName() {
 
   @Override
   protected ValidationResult<RpcErrorType> validateParameters(
-          final EnginePayloadParameter payloadParameter,
-          final Optional<List<String>> maybeVersionedHashParam,
-          final Optional<String> maybeBeaconBlockRootParam,
-          final Optional<List<String>> maybeRequestsParam) {
+      final EnginePayloadParameter payloadParameter,
+      final Optional<List<String>> maybeVersionedHashParam,
+      final Optional<String> maybeBeaconBlockRootParam,
+      final Optional<List<String>> maybeRequestsParam) {
     if (payloadParameter.getBlobGasUsed() != null) {
       return ValidationResult.invalid(
           RpcErrorType.INVALID_PARAMS, "non-null BlobGasUsed pre-cancun");

diff --git a/...erledger/besu/ethereum/trie/diffbased/verkle/storage/VerkleWorldStateKeyValueStorage.java b/...erledger/besu/ethereum/trie/diffbased/verkle/storage/VerkleWorldStateKeyValueStorage.java
@@ -55,7 +55,8 @@ public VerkleWorldStateKeyValueStorage(
             List.of(
                 ACCOUNT_INFO_STATE, CODE_STORAGE, ACCOUNT_STORAGE_STORAGE, TRIE_BRANCH_STORAGE)),
         provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE));
-    this.flatDbStrategy = new BonsaiFullFlatDbStrategy(metricsSystem, new CodeHashCodeStorageStrategy());
+    this.flatDbStrategy =
+        new BonsaiFullFlatDbStrategy(metricsSystem, new CodeHashCodeStorageStrategy());
   }
 
   public VerkleWorldStateKeyValueStorage(

diff --git a/...test-support/java/org/hyperledger/besu/ethereum/core/InMemoryKeyValueStorageProvider.java b/...test-support/java/org/hyperledger/besu/ethereum/core/InMemoryKeyValueStorageProvider.java
@@ -125,7 +125,7 @@ public static VerkleWorldStateProvider createVerkleInMemoryWorldStateArchive(
     final DataStorageConfiguration verkleDataStorageConfig =
         ImmutableDataStorageConfiguration.builder()
             .dataStorageFormat(DataStorageFormat.VERKLE)
-                .diffBasedSubStorageConfiguration(DiffBasedSubStorageConfiguration.DEFAULT)
+            .diffBasedSubStorageConfiguration(DiffBasedSubStorageConfiguration.DEFAULT)
             .build();
     return new VerkleWorldStateProvider(
         (VerkleWorldStateKeyValueStorage)

diff --git a/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java b/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
@@ -144,9 +144,9 @@ public boolean isValid(final Block block) {
   @Override
   public boolean areAllTransactionsValid(final Block block) {
     Optional<CandidateBlock> candidateBlock =
-            Arrays.stream(candidateBlocks)
-                    .filter(cb -> Objects.equals(cb.getBlock(), block))
-                    .findFirst();
+        Arrays.stream(candidateBlocks)
+            .filter(cb -> Objects.equals(cb.getBlock(), block))
+            .findFirst();
     return candidateBlock.isPresent() && candidateBlock.get().areAllTransactionsValid();
   }
 

diff --git a/...c/main/java/org/hyperledger/besu/ethereum/referencetests/VerkleReferenceTestCaseSpec.java b/...c/main/java/org/hyperledger/besu/ethereum/referencetests/VerkleReferenceTestCaseSpec.java
@@ -16,7 +16,6 @@
 
 import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createVerkleInMemoryWorldStateArchive;
 
-import org.apache.commons.lang3.NotImplementedException;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
@@ -31,7 +30,6 @@
 import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ParsedExtraData;
-import org.hyperledger.besu.ethereum.core.Request;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
@@ -50,6 +48,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.tuweni.bytes.Bytes;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -300,12 +299,12 @@ public Block getBlock() {
       final MainnetBlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
       final BlockHeader header = BlockHeader.readFrom(input, blockHeaderFunctions);
       final BlockBody body =
-              new BlockBody(
-                      input.readList(Transaction::readFrom),
-                      input.readList(inputData -> BlockHeader.readFrom(inputData, blockHeaderFunctions)),
-                      input.isEndOfCurrentList()
-                              ? Optional.empty()
-                              : Optional.of(input.readList(Withdrawal::readFrom)));
+          new BlockBody(
+              input.readList(Transaction::readFrom),
+              input.readList(inputData -> BlockHeader.readFrom(inputData, blockHeaderFunctions)),
+              input.isEndOfCurrentList()
+                  ? Optional.empty()
+                  : Optional.of(input.readList(Withdrawal::readFrom)));
       return new Block(header, body);
     }
   }