merge master to atomic base branch #744
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
darioush
approved these changes
Jan 13, 2025
| @@ -68,7 +75,7 @@ type AtomicBackend interface { | |||
| } | |||
|
|
|||
| // atomicBackend implements the AtomicBackend interface using | |||
| // the AtomicTrie, AtomicTxRepository, and the VM's shared memory. | |||
| // the interfaces.AtomicTrie, AtomicTxRepository, and the VM's shared memory. | |||
There was a problem hiding this comment.
is this comment still correct?
| @@ -140,7 +144,7 @@ func newAtomicTrie( | |||
| } | |||
| // initialize to EmptyRootHash if there is no committed root. | |||
| if root == (common.Hash{}) { | |||
| root = types.EmptyRootHash | |||
| root = EmptyAtomicRootHash | |||
There was a problem hiding this comment.
optional: we can import this from go-ethereum's upstream type if we don't want to duplicate this
There was a problem hiding this comment.
I reverted it since it should be good after libevm transition
| _ AtomicTrie = &atomicTrie{} | ||
| lastCommittedKey = []byte("atomicTrieLastCommittedBlock") | ||
| appliedSharedMemoryCursorKey = []byte("atomicTrieLastAppliedToSharedMemory") | ||
| AtomicKeyLength = wrappers.LongLen + common.HashLength |
There was a problem hiding this comment.
nit: should we rename this to AtomicTrieKeyLength to be more descriptive?
We cannot move it in this PR as we use them in plugin/evm. We might be able to move them once we isolate the atomic pkg. (golang only allows internal pkgs to be used from their root) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges master (at b6b4dfb) to atomic base branch