Merge bal devnet 7 into glamsterdam devnet 6 (#10774)

Signed-off-by: Karim Taam <karim.t2am@gmail.com>

Author: matkt

CHANGELOG.md

@@ -18,6 +18,7 @@
 - BFT option `xemptyblockperiodseconds` has been taken out of experimental and been renamed `emptyblockperiodseconds`. The old config option is deprecated and will be removed in a future release.
 
 ### Bug fixes
+- `testing_buildBlockV1` now sets the mining coinbase to the requested `suggestedFeeRecipient` before building, so the block header coinbase matches the account credited transaction fees and the EIP-7928 block access list. Previously the header used the node's configured coinbase (`Address.ZERO` on a block builder), so a non-zero `suggestedFeeRecipient` produced a block that self-rejected on `engine_newPayload` re-execution with a block access list hash mismatch.
 
 ### Additions and Improvements
 - The option to set a different block period for empty BFT blocks (`emptyblockperiodseconds`) is no longer experimental. The experimental flag `xemptyblockperiodseconds` will be removed in a future release.

app/src/main/java/org/hyperledger/besu/cli/options/BalConfigurationOptions.java

@@ -17,8 +17,6 @@
 import org.hyperledger.besu.ethereum.mainnet.BalConfiguration;
 import org.hyperledger.besu.ethereum.mainnet.ImmutableBalConfiguration;
 
-import java.time.Duration;
-
 import picocli.CommandLine;
 
 /** Command-line options for configuring Block Access List behaviour. */
@@ -33,19 +31,6 @@ public BalConfigurationOptions() {}
           "Allows disabling BAL-based perfect parallelization even when BALs are present.")
   boolean balPerfectParallelizationEnabled = true;
 
-  @CommandLine.Option(
-      names = {"--Xbal-lenient-on-state-root-mismatch"},
-      hidden = true,
-      description =
-          "Log an error instead of throwing when the BAL-computed state root does not match the synchronously computed root.")
-  boolean balLenientOnStateRootMismatch = true;
-
-  @CommandLine.Option(
-      names = {"--Xbal-trust-state-root"},
-      hidden = true,
-      description = "Trust the BAL-computed state root without verification.")
-  boolean balTrustStateRoot = true;
-
   @CommandLine.Option(
       names = {"--Xbal-state-root-enabled"},
       hidden = true,
@@ -60,20 +45,6 @@ public BalConfigurationOptions() {}
       description = "Log the constructed and block's BAL when they differ.")
   boolean balLogBalsOnMismatch = false;
 
-  @CommandLine.Option(
-      names = {"--Xbal-state-root-timeout"},
-      hidden = true,
-      paramLabel = "<INTEGER>",
-      description = "Timeout in milliseconds when waiting for the BAL-computed state root.")
-  private long balStateRootTimeoutMs = -1;
-
-  @CommandLine.Option(
-      names = {"--Xbal-processing-timeout"},
-      hidden = true,
-      paramLabel = "<INTEGER>",
-      description = "Timeout in milliseconds when waiting for BAL transaction processing results.")
-  private long balProcessingTimeoutMs = -1;
-
   @CommandLine.Option(
       names = {"--Xbal-prefetch-reading-enabled"},
       hidden = true,
@@ -91,7 +62,7 @@ public BalConfigurationOptions() {}
       names = {"--Xbal-prefetch-batch-size"},
       hidden = true,
       description = "Enable custom BAL prefetch batch size (default: ${DEFAULT-VALUE}).")
-  int balPreFetchBatch = 100;
+  int balPreFetchBatch = 8;
 
   /**
    * Builds the immutable {@link BalConfiguration} corresponding to the parsed CLI options.
@@ -102,14 +73,10 @@ public BalConfiguration toDomainObject() {
     return ImmutableBalConfiguration.builder()
         .isPerfectParallelizationEnabled(balPerfectParallelizationEnabled)
         .shouldLogBalsOnMismatch(balLogBalsOnMismatch)
-        .isBalLenientOnStateRootMismatch(balLenientOnStateRootMismatch)
-        .isBalStateRootTrusted(balTrustStateRoot)
         .isBalStateRootEnabled(balStateRootEnabled)
         .isBalPreFetchReadingEnabled(balPreFetchReadingEnabled)
         .isBalPreFetchSortingEnabled(balPreFetchSortingEnabled)
         .balPreFetchBatchSize(balPreFetchBatch)
-        .balStateRootTimeout(Duration.ofMillis(balStateRootTimeoutMs))
-        .balProcessingTimeout(Duration.ofMillis(balProcessingTimeoutMs))
         .build();
   }
 }

app/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java

@@ -664,16 +664,8 @@ public BesuController build() {
       preloadBlockHeaderCache(blockchain, scheduler);
     }
 
-    boolean balStateRootTrusted = balConfiguration.isBalStateRootTrusted();
-    final BonsaiCachedMerkleTrieLoader bonsaiCachedMerkleTrieLoader;
-    if (balStateRootTrusted) {
-      bonsaiCachedMerkleTrieLoader = new NoopBonsaiCachedMerkleTrieLoader();
-    } else {
-      bonsaiCachedMerkleTrieLoader =
-          besuComponent
-              .map(BesuComponent::getCachedMerkleTrieLoader)
-              .orElseGet(() -> new BonsaiCachedMerkleTrieLoader(metricsSystem));
-    }
+    final BonsaiCachedMerkleTrieLoader bonsaiCachedMerkleTrieLoader =
+        new NoopBonsaiCachedMerkleTrieLoader();
 
     final var worldStateHealerSupplier = new AtomicReference<WorldStateHealer>();
 

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/testing/TestingBuildBlockV1.java

@@ -211,6 +211,15 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
       final Address coinbase = payloadAttributes.getSuggestedFeeRecipient();
 
+      // The header coinbase is sourced from miningConfiguration (see
+      // BlockHeaderBuilder.createPending), whereas transaction fees and the EIP-7928
+      // block access list are credited to the mining beneficiary derived from the
+      // suggestedFeeRecipient below. Without aligning the two, the built block's header
+      // records the node's configured coinbase (Address.ZERO on a filler) while the BAL
+      // credits suggestedFeeRecipient, so re-execution on engine_newPayload recomputes a
+      // BAL under the header coinbase and the block self-rejects with a BAL hash mismatch.
+      miningConfiguration.setCoinbase(coinbase);
+
       final TestingBlockCreator blockCreator =
           new TestingBlockCreator(
               miningConfiguration,

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/testing/TestingBuildBlockV1Test.java

@@ -16,6 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.datatypes.Address;
@@ -149,6 +150,31 @@ void shouldReturnErrorWhenMissingSuggestedFeeRecipient() {
     assertThat(errorResponse.getError().getCode()).isEqualTo(RpcErrorType.INVALID_PARAMS.getCode());
   }
 
+  @Test
+  void shouldPropagateSuggestedFeeRecipientToMiningCoinbase() {
+    // The built block header coinbase is sourced from the mining configuration (see
+    // BlockHeaderBuilder.createPending), whereas transaction fees and the EIP-7928 block
+    // access list are credited to the mining beneficiary derived from suggestedFeeRecipient.
+    // Building must propagate suggestedFeeRecipient into the mining configuration so the two
+    // agree; otherwise the built header records the node's configured coinbase (Address.ZERO
+    // on a block-builder node) while the block access list credits suggestedFeeRecipient, and
+    // the block self-rejects on engine_newPayload re-execution with a BAL hash mismatch.
+    final BlockHeader parentHeader =
+        new BlockHeaderTestFixture().timestamp(DEFAULT_TIMESTAMP).buildHeader();
+    when(blockchain.getBlockHeader(any(Hash.class))).thenReturn(Optional.of(parentHeader));
+    final Address suggestedFeeRecipient =
+        Address.fromHexString("0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba");
+
+    // Block creation itself fails fast under the mocked protocol schedule, but the coinbase
+    // must already have been propagated to the mining configuration before the build is
+    // attempted.
+    method.response(
+        requestWithSuggestedFeeRecipient(
+            parentHeader.getHash().toHexString(), DEFAULT_TIMESTAMP + 1, suggestedFeeRecipient));
+
+    verify(miningConfiguration).setCoinbase(suggestedFeeRecipient);
+  }
+
   @Test
   void verifyBlockAccessListEncodingFormat() {
     final BlockAccessList blockAccessList = createSampleBlockAccessList();
@@ -352,6 +378,22 @@ private JsonRpcRequestContext requestWithTransactions(
             new Object[] {parentHash, payloadAttributes, transactions, null}));
   }
 
+  private JsonRpcRequestContext requestWithSuggestedFeeRecipient(
+      final String parentHash, final long timestamp, final Address suggestedFeeRecipient) {
+    final Map<String, Object> payloadAttributes = new LinkedHashMap<>();
+    payloadAttributes.put("timestamp", Bytes.ofUnsignedLong(timestamp).toQuantityHexString());
+    payloadAttributes.put("prevRandao", Hash.ZERO.toHexString());
+    payloadAttributes.put("suggestedFeeRecipient", suggestedFeeRecipient.toHexString());
+    payloadAttributes.put("withdrawals", Collections.emptyList());
+    payloadAttributes.put("parentBeaconBlockRoot", Bytes32.ZERO.toHexString());
+
+    return new JsonRpcRequestContext(
+        new JsonRpcRequest(
+            "2.0",
+            "testing_buildBlockV1",
+            new Object[] {parentHash, payloadAttributes, new String[0], null}));
+  }
+
   private JsonRpcRequestContext requestWithMissingSuggestedFeeRecipient(
       final String parentHash, final long timestamp) {
     final Map<String, Object> payloadAttributes = new LinkedHashMap<>();

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/TestingBuildBlockIntegrationTest.java

@@ -391,7 +391,6 @@ private TestContext createTestContext(final boolean withBAL) {
                         new BadBlockManager(),
                         false,
                         ImmutableBalConfiguration.builder()
-                            .isBalStateRootTrusted(withBAL)
                             .isPerfectParallelizationEnabled(withBAL)
                             .build(),
                         new NoOpMetricsSystem())

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java

@@ -342,23 +342,6 @@ public BlockProcessingResult processBlock(
         applyPartialBlockAccessView(
             transactionProcessingResult.getPartialBlockAccessView(), blockAccessListBuilder);
 
-        if (blockAccessListBuilder.isPresent()) {
-          final BlockAccessListItemSizeCheck itemSizeCheck =
-              protocolSpec
-                  .getBlockAccessListValidator()
-                  .validateExecutedBlockAccessListItemSize(
-                      blockAccessListBuilder.get().eip7928ItemCount(), blockHeader, protocolSpec);
-          if (itemSizeCheck.isOverBudget()) {
-            final String errorMessage =
-                itemSizeCheck.overBudgetError().orElseThrow().errorMessage();
-            LOG.error(errorMessage);
-            if (worldState instanceof BonsaiWorldState) {
-              ((BonsaiWorldStateUpdateAccumulator) blockUpdater).reset();
-            }
-            return new BlockProcessingResult(Optional.empty(), errorMessage);
-          }
-        }
-
         if (transactionUpdater instanceof StackedUpdater<?, ?>) {
           transactionUpdater.commit();
         }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BalConfiguration.java

@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import java.time.Duration;
-
 import org.immutables.value.Value;
 
 /** Configuration options for Block Access List (BAL) processing. */
@@ -24,11 +22,9 @@ public interface BalConfiguration {
 
   BalConfiguration DEFAULT = ImmutableBalConfiguration.builder().build();
 
-  /** Returns whether the BAL-computed state root should be trusted without verification. */
-  @Value.Default
-  default boolean isBalStateRootTrusted() {
-    return true;
-  }
+  /** Configuration with BAL state root disabled (uses standard accumulator-based root). */
+  BalConfiguration DISABLED =
+      ImmutableBalConfiguration.builder().isBalStateRootEnabled(false).build();
 
   /**
    * Returns whether to use the BAL-based state root commit path when a BAL is available. When
@@ -45,15 +41,6 @@ default boolean isPerfectParallelizationEnabled() {
     return true;
   }
 
-  /**
-   * Returns whether mismatches between BAL and synchronously computed state roots should only log
-   * an error instead of throwing an exception.
-   */
-  @Value.Default
-  default boolean isBalLenientOnStateRootMismatch() {
-    return true;
-  }
-
   /** Returns whether prefetching of state data based on BAL read operations is enabled. */
   @Value.Default
   default boolean isBalPreFetchReadingEnabled() {
@@ -72,26 +59,12 @@ default boolean shouldLogBalsOnMismatch() {
     return false;
   }
 
-  /** Returns the timeout to use when waiting for the BAL-computed state root. */
-  @Value.Default
-  default Duration getBalStateRootTimeout() {
-    return Duration.ofSeconds(-1);
-  }
-
-  /** Returns the timeout to use when waiting for BAL transaction processing results. */
-  @Value.Default
-  default Duration getBalProcessingTimeout() {
-    return Duration.ofSeconds(-1);
-  }
-
   /**
    * Returns the batch size for prefetch operations. A value of 0 or negative means no batching
    * (fetch all at once).
-   *
-   * @return the batch size for prefetch operations
    */
   @Value.Default
   default int getBalPreFetchBatchSize() {
-    return 100; // Default: no batching, fetch all at once
+    return 8;
   }
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/block/access/list/BlockAccessList.java

@@ -68,7 +68,8 @@ public boolean isEmpty() {
 
   public long eip7928ItemCount() {
     long totalStorageKeys = 0;
-    for (AccountChanges accountChange : accountChanges) {
+    for (int i = 0, accountChangesSize = accountChanges.size(); i < accountChangesSize; i++) {
+      AccountChanges accountChange = accountChanges.get(i);
       totalStorageKeys += accountChange.storageChanges().size();
       totalStorageKeys += accountChange.storageReads().size();
     }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/block/access/list/BlockAccessListAddressView.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright contributors to Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.block.access.list;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Address-indexed view of a {@link BlockAccessList}, built once per block. Does not resolve
+ * transaction indices or materialize state — use {@link BlockAccessListOverlay} for per-transaction
+ * prior state.
+ */
+public final class BlockAccessListAddressView {
+
+  private final Map<Address, AccountEntry> accountEntries;
+
+  private BlockAccessListAddressView(final Map<Address, AccountEntry> accountEntries) {
+    this.accountEntries = accountEntries;
+  }
+
+  public static BlockAccessListAddressView of(final BlockAccessList blockAccessList) {
+    final List<BlockAccessList.AccountChanges> accountChanges = blockAccessList.accountChanges();
+    final Map<Address, AccountEntry> entries = HashMap.newHashMap(accountChanges.size());
+    for (final BlockAccessList.AccountChanges changes : accountChanges) {
+      entries.put(changes.address(), new AccountEntry(changes));
+    }
+    return new BlockAccessListAddressView(entries);
+  }
+
+  public Optional<BlockAccessList.AccountChanges> getAccountChanges(final Address address) {
+    final AccountEntry entry = accountEntries.get(address);
+    return entry == null ? Optional.empty() : Optional.of(entry.accountChanges);
+  }
+
+  public Optional<Hash> getAddressHash(final Address address) {
+    final AccountEntry entry = accountEntries.get(address);
+    return entry == null ? Optional.empty() : Optional.of(entry.addressHash);
+  }
+
+  Optional<BlockAccessList.SlotChanges> getSlotChanges(
+      final Address address, final StorageSlotKey storageSlotKey) {
+    final AccountEntry entry = accountEntries.get(address);
+    return entry == null ? Optional.empty() : entry.slotChanges(storageSlotKey);
+  }
+
+  private static final class AccountEntry {
+    private final BlockAccessList.AccountChanges accountChanges;
+    private final Hash addressHash;
+    private final Map<StorageSlotKey, BlockAccessList.SlotChanges> storageBySlot;
+
+    private AccountEntry(final BlockAccessList.AccountChanges accountChanges) {
+      this.accountChanges = accountChanges;
+      this.addressHash = accountChanges.address().addressHash();
+      this.storageBySlot = buildStorageBySlot(accountChanges.storageChanges());
+    }
+
+    private static Map<StorageSlotKey, BlockAccessList.SlotChanges> buildStorageBySlot(
+        final List<BlockAccessList.SlotChanges> storageChanges) {
+      if (storageChanges.isEmpty()) {
+        return Map.of();
+      }
+      final Map<StorageSlotKey, BlockAccessList.SlotChanges> built =
+          HashMap.newHashMap(storageChanges.size());
+      for (final BlockAccessList.SlotChanges slotChange : storageChanges) {
+        built.put(slotChange.slot(), slotChange);
+      }
+      return built;
+    }
+
+    Optional<BlockAccessList.SlotChanges> slotChanges(final StorageSlotKey storageSlotKey) {
+      return Optional.ofNullable(storageBySlot.get(storageSlotKey));
+    }
+  }
+}