Implement BitArray and replace trie.Key (#2322)

NethermindEth · Jan 23, 2025 · 4d99dd0 · 4d99dd0
1 parent b45cae5
commit 4d99dd0
Show file tree

Hide file tree

Showing 16 changed files with 3,219 additions and 597 deletions.
diff --git a/core/state.go b/core/state.go
@@ -139,9 +139,9 @@ func (s *State) globalTrie(bucket db.Bucket, newTrie trie.NewTrieFunc) (*trie.Tr
 
 	// fetch root key
 	rootKeyDBKey := dbPrefix
-	var rootKey *trie.Key
+	var rootKey *trie.BitArray // TODO: use value instead of pointer
 	err := s.txn.Get(rootKeyDBKey, func(val []byte) error {
-		rootKey = new(trie.Key)
+		rootKey = new(trie.BitArray)
 		return rootKey.UnmarshalBinary(val)
 	})
 
@@ -169,7 +169,7 @@ func (s *State) globalTrie(bucket db.Bucket, newTrie trie.NewTrieFunc) (*trie.Tr
 
 		if resultingRootKey != nil {
 			var rootKeyBytes bytes.Buffer
-			_, marshalErr := resultingRootKey.WriteTo(&rootKeyBytes)
+			_, marshalErr := resultingRootKey.Write(&rootKeyBytes)
 			if marshalErr != nil {
 				return marshalErr
 			}