mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-12 09:51:36 +00:00
64d185616c
binaryHasher.updateAccount computed codeLen from len(account.Code.Code), which is only non-zero when the code itself was modified in the current block. For balance- or nonce-only updates account.Code is nil and the computed codeLen was 0, silently overwriting the code_size field packed into the bintrie BasicData leaf (EIP-7864 bytes 5-7) with zero every time a contract was touched without a code write. The TODO(rjl493456442) on updateAccount acknowledged this. Fix it by adding a CodeSize field to AccountMut and having the caller at StateDB.IntermediateRoot populate it via stateObject.CodeSize(), which returns len(obj.code) when the bytes are loaded, otherwise falls back to a code-size lookup via the reader. The binary hasher then passes account.CodeSize straight to BinaryTrie.UpdateAccount as its codeLen argument, and the TODO is removed. Rationale for placing CodeSize on AccountMut rather than Account: AccountMut already carries Code *CodeMut — the new bytecode, which is not a field of Account — because code is write-time data that is not persisted in the flat-state format (SlimAccountRLP). CodeSize has the identical lifecycle: it is not in SlimAccountRLP, it is not populated by any reader, and it is only consumed by the hasher at write time. Mirroring Code's placement keeps the read-side/write-side split honest (Account models the persisted flat-state record; AccountMut adds the code-related write-time parameters). If the bintrie flat-state format is later extended to carry code_size, CodeSize can be promoted onto Account at that time. merkleHasher is unaffected: StateTrie.UpdateAccount ignores its codeLen parameter, so the wrapTrie.UpdateAccount shim continues to pass 0 and no state-root divergence is introduced on the MPT path. Regression test TestVerkleCodeSizePreserved verifies that the state root produced by "create contract, commit, reload, modify balance, commit" matches the root of a single-step construction of the same final state. Before the fix the roots diverge: path A (reload + balance): 1a675599... path B (fresh, same state): de0cfb03... |
||
|---|---|---|
| .. | ||
| pruner | ||
| snapshot | ||
| access_events.go | ||
| access_events_test.go | ||
| access_list.go | ||
| database.go | ||
| database_code.go | ||
| database_hasher.go | ||
| database_hasher_binary.go | ||
| database_hasher_binary_test.go | ||
| database_hasher_merkle.go | ||
| database_hasher_merkle_test.go | ||
| database_history.go | ||
| database_iterator.go | ||
| database_iterator_test.go | ||
| dump.go | ||
| iterator.go | ||
| iterator_test.go | ||
| journal.go | ||
| metrics.go | ||
| reader.go | ||
| reader_stater.go | ||
| state_mut.go | ||
| state_object.go | ||
| state_object_test.go | ||
| state_sizer.go | ||
| state_sizer_test.go | ||
| state_test.go | ||
| statedb.go | ||
| statedb_fuzz_test.go | ||
| statedb_hooked.go | ||
| statedb_hooked_test.go | ||
| statedb_stats.go | ||
| statedb_test.go | ||
| stateupdate.go | ||
| sync.go | ||
| sync_test.go | ||
| transient_storage.go | ||
| trie_prefetcher.go | ||
| trie_prefetcher_test.go | ||