snap sync - apply BALs before flat db heal #10151
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * 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.StorageSlotKey; | ||
| import org.hyperledger.besu.datatypes.Wei; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes; | ||
| import org.apache.tuweni.units.bigints.UInt256; | ||
|
|
||
| public final class BlockAccessListChanges { | ||
|
|
||
| private BlockAccessListChanges() {} | ||
|
|
||
| public static List<AccountFinalChanges> latestChanges(final BlockAccessList blockAccessList) { | ||
| final List<AccountFinalChanges> accountFinalChanges = new ArrayList<>(); | ||
|
|
||
| for (final BlockAccessList.AccountChanges accountChanges : blockAccessList.accountChanges()) { | ||
| if (!accountChanges.hasAnyChange()) { | ||
| continue; | ||
| } | ||
|
|
||
| final List<StorageFinalChange> storageFinalChanges = new ArrayList<>(); | ||
| for (final BlockAccessList.SlotChanges slotChanges : accountChanges.storageChanges()) { | ||
| final Optional<BlockAccessList.StorageChange> latestStorageChange = | ||
| lastOf(slotChanges.changes()); | ||
| if (latestStorageChange.isPresent()) { | ||
| storageFinalChanges.add( | ||
| new StorageFinalChange( | ||
| slotChanges.slot(), | ||
| latestStorageChange.get().newValue() == null | ||
| ? UInt256.ZERO | ||
| : latestStorageChange.get().newValue())); | ||
| } | ||
| } | ||
|
|
||
| accountFinalChanges.add( | ||
| new AccountFinalChanges( | ||
| accountChanges.address(), | ||
| lastOf(accountChanges.balanceChanges()) | ||
| .map(BlockAccessList.BalanceChange::postBalance), | ||
| lastOf(accountChanges.nonceChanges()).map(BlockAccessList.NonceChange::newNonce), | ||
| lastOf(accountChanges.codeChanges()).map(BlockAccessList.CodeChange::newCode), | ||
| storageFinalChanges)); | ||
| } | ||
|
|
||
| return accountFinalChanges; | ||
| } | ||
|
|
||
| public record AccountFinalChanges( | ||
| Address address, | ||
| Optional<Wei> balance, | ||
| Optional<Long> nonce, | ||
| Optional<Bytes> code, | ||
| List<StorageFinalChange> storageChanges) {} | ||
|
|
||
| public record StorageFinalChange(StorageSlotKey slot, UInt256 value) {} | ||
|
|
||
| private static <T> Optional<T> lastOf(final List<T> list) { | ||
| return list.isEmpty() ? Optional.empty() : Optional.of(list.getLast()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if we keep all the pivot blocks used during snapsync you can completely skip the fladb healing if all the pivot blocks used are canonical and only trigger the heal if one of the block is not canonical
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not necessarily all pivots, as we already discussed. It's a valid point but hopefully you don't want to address it in this PR :)