Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix trielog shipping issue during self destruct #6340

Merged
merged 7 commits into from
Jan 3, 2024
Merged

Fix trielog shipping issue during self destruct #6340

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57928bc
fix trielog shipping issue
matkt Nov 30, 2023
9ed3d90
spotless apply
matkt Nov 30, 2023
d9de070
mark deleted slot during clear storage step
matkt Dec 15, 2023
7befb3a
Merge branch 'feature/fix-trielog' into feature/fix-trielog-shipping-…
matkt Dec 17, 2023
e818560
Merge branch 'main' into feature/fix-trielog-shipping-issue
matkt Jan 3, 2024
295a089
update gradle hash
matkt Jan 3, 2024
68eac6a
Merge branch 'main' into feature/fix-trielog-shipping-issue
matkt Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
mark deleted slot during clear storage step 
Signed-off-by: Karim Taam <karim.t2am@gmail.com>
  • Loading branch information
@matkt
matkt committed Dec 15, 2023
commit d9de070d004e082b65e05b172e4a4c98baf68175
23 changes: 17 additions & 6 deletions ...e/src/main/java/org/hyperledger/besu/ethereum/trie/bonsai/worldview/BonsaiWorldState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

import org.apache.tuweni.bytes.Bytes;
import org.apache.tuweni.bytes.Bytes32;
import org.apache.tuweni.rlp.RLP;
import org.apache.tuweni.units.bigints.UInt256;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -361,14 +362,24 @@ private void clearStorage(
(location, key) -> getStorageTrieNode(addressHash, location, key),
oldAccount.getStorageRoot());
try {

final StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>> storageToDelete =
worldStateUpdater.getStorageToUpdate().get(address);
Map<Bytes32, Bytes> entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
while (!entriesToDelete.isEmpty()) {
entriesToDelete
.keySet()
.forEach(
k ->
bonsaiUpdater.removeStorageValueBySlotHash(
address.addressHash(), Hash.wrap(k)));
entriesToDelete.forEach(
(k, v) -> {
final StorageSlotKey storageSlotKey =
new StorageSlotKey(Hash.wrap(k), Optional.empty());
final UInt256 slotValue =
UInt256.fromBytes(Bytes32.leftPad(RLP.decodeValue(v)));
bonsaiUpdater.removeStorageValueBySlotHash(
address.addressHash(), storageSlotKey.getSlotHash());
storageToDelete
.computeIfAbsent(
storageSlotKey, key -> new BonsaiValue<>(slotValue, null, true))
.setPrior(slotValue);
});
entriesToDelete.keySet().forEach(storageTrie::remove);
if (entriesToDelete.size() == 256) {
entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
Expand Down
Loading