complete main merge

Signed-off-by: Karim Taam <[email protected]>
hyperledger · Nov 27, 2024 · 588a058 · 588a058
2 parents 72d2781 + 674a7ba
commit 588a058
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClearEmptyAccountStrategy.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClearEmptyAccountStrategy.java
@@ -48,6 +48,7 @@ public void process(final WorldUpdater worldUpdater) {
               .filter(Account::isEmpty)
               .forEach(a -> worldUpdater.deleteAccount(a.getAddress()));
     }
+
     @Override
     public boolean clearEmptyAccountAllowed(final Address address) {
       return true;

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/trie/common/VerkleStateTrieAccountValue.java b/.../src/main/java/org/hyperledger/besu/ethereum/trie/common/VerkleStateTrieAccountValue.java
@@ -25,7 +25,7 @@
 
 import org.apache.tuweni.bytes.Bytes32;
 
-/** Represents the raw values associated with an account in the world state trie. */
+/** Represents the raw values associated with an account in the world state verkle trie. */
 public class VerkleStateTrieAccountValue extends AbstractStateTrieAccountValue
     implements AccountValue {
 
@@ -101,4 +101,4 @@ public static VerkleStateTrieAccountValue readFrom(final RLPInput in) {
 
     return new VerkleStateTrieAccountValue(nonce, balance, Hash.wrap(codeHash), codeSize);
   }
-}
+}
diff --git a/...in/java/org/hyperledger/besu/ethereum/trie/diffbased/verkle/VerkleWorldStateProvider.java b/...in/java/org/hyperledger/besu/ethereum/trie/diffbased/verkle/VerkleWorldStateProvider.java
@@ -63,6 +63,4 @@ public VerkleWorldStateProvider(
         new VerkleWorldState(
             this, worldStateKeyValueStorage, evmConfiguration, defaultWorldStateConfig));
   }
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,4 @@ public VerkleWorldStateProvider( @@
             new VerkleWorldState(
                 this, worldStateKeyValueStorage, evmConfiguration, defaultWorldStateConfig));
       }
     }