[REMOVE AFTER #7778] include new version of verkle-trie impl

Signed-off-by: Luis Pinto <[email protected]>
hyperledger · Dec 10, 2024 · 16b15db · 16b15db
1 parent 836137a
commit 16b15db
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.../java/org/hyperledger/besu/ethereum/trie/diffbased/verkle/worldview/VerkleWorldState.java b/.../java/org/hyperledger/besu/ethereum/trie/diffbased/verkle/worldview/VerkleWorldState.java
@@ -169,9 +169,7 @@ protected Hash internalCalculateRootHash(
               }
 
               preloadedHashers.put(
-                  accountKey,
-                  trieKeyPreloader.createPreloadedHasher(
-                      accountKey, accountKeyIds, storageKeyIds, codeKeyIds));
+                  accountKey, trieKeyPreloader.createPreloadedHasher(storageKeyIds, codeKeyIds));
             });
 
     for (final Address accountKey : addressesToPersist) {

diff --git a/...m/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/TrieKeyPreloader.java b/...m/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/TrieKeyPreloader.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.verkletrie;
 
-import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.StorageSlotKey;
 import org.hyperledger.besu.ethereum.trie.verkle.adapter.TrieKeyBatchAdapter;
 import org.hyperledger.besu.ethereum.trie.verkle.hasher.CachedPedersenHasher;
@@ -24,6 +23,7 @@
 
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -60,13 +60,9 @@ public List<Bytes32> generateStorageKeyIds(final Set<StorageSlotKey> storageSlot
   }
 
   public HasherContext createPreloadedHasher(
-      final Address address,
-      final List<Bytes32> accountKeyIds,
-      final List<Bytes32> storageKeyIds,
-      final List<Bytes32> codeChunkIds) {
+      final List<Bytes32> storageKeyIds, final List<Bytes32> codeChunkIds) {
     return new HasherContext(
-        new CachedPedersenHasher(
-            trieKeyAdapter.manyTrieKeyHashes(address, accountKeyIds, storageKeyIds, codeChunkIds)),
+        new CachedPedersenHasher(10_000, new ConcurrentHashMap<>()),
         !storageKeyIds.isEmpty(),
         !codeChunkIds.isEmpty());
   }

diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/stateless/Eip4762AccessWitness.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/stateless/Eip4762AccessWitness.java
@@ -256,8 +256,8 @@ private long touchAddressOnReadAndComputeGas(
 
   private List<UInt256> getStorageSlotTreeIndexes(final UInt256 storageKey) {
     return List.of(
-        TRIE_KEY_ADAPTER.locateStorageKeyOffset(storageKey),
-        TRIE_KEY_ADAPTER.locateStorageKeySuffix(storageKey));
+        TRIE_KEY_ADAPTER.getStorageKeyTrieIndex(storageKey),
+        UInt256.fromBytes(TRIE_KEY_ADAPTER.getStorageKeySuffix(storageKey)));
   }
 
   @Override

diff --git a/platform/build.gradle b/platform/build.gradle
@@ -183,7 +183,7 @@ dependencies {
 
     api 'org.hyperledger.besu:ipa-multipoint:0.8.4-SNAPSHOT'
 
-    api 'org.hyperledger.besu:besu-verkle-trie:0.0.3-20241002.133354-5'
+    api 'org.hyperledger.besu:besu-verkle-trie:0.0.3-20241107.124625-9'
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,7 +183,7 @@ dependencies { @@
         api 'org.hyperledger.besu:ipa-multipoint:0.8.4-SNAPSHOT'
-        api 'org.hyperledger.besu:besu-verkle-trie:0.0.3-20241002.133354-5'
+        api 'org.hyperledger.besu:besu-verkle-trie:0.0.3-20241107.124625-9'
       }
     }
@@ Expand Down @@