Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(trie): combine get/set for root into function #2219

Merged
merged 35 commits into from
Aug 24, 2022
Merged

refactor(trie): combine get/set for root into function #2219

merged 35 commits into from
Aug 24, 2022

Conversation

faustbrian
Copy link
Contributor

@faustbrian faustbrian commented Aug 24, 2022 •
edited
Loading

Leaving as draft until #2215 is merged

Same as #2218 to avoid black magic and improve DX.

holgerd77 and others added 30 commits August 23, 2022 12:32
@holgerd77
trie: removed deprecated prove() function (renamed to createProof())
fe64bd1
@holgerd77
trie: added secure option to base trie, integrated secure trie functi…
ddadf76 
…onality
@holgerd77
trie: adopted secureTrie.spec.ts tests (5 failing)
aa731fb
@holgerd77
trie: fixed copy function
3a511d8
@holgerd77
trie: fixed secureTrie.spec.ts branching test
ce77025
@holgerd77
trie: additional test fixes
5cb020a
@holgerd77
trie: removed secure.ts SecureTrie class definition file
80156ec
@holgerd77
trie: updated README
31f89cb
@holgerd77
trie: removed secure export, unified prepareTrieOpts and expand to Ch…
f090a80 
…eckpointTrie
@faustbrian
chore: wip
93dc08e 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
19f06dd 
Signed-off-by: Brian Faust <hello@basecode.sh>
@holgerd77
trie: renamed _secure -> _hashKeys and _hash() -> _hashKeysFunction
3042ff7
@faustbrian
refactor(trie): rename secure to useHashedKeys
789607e
@faustbrian
Merge branch 'refactore-secure-trie-as-an-option' into trie-checkpoin…
7add314 
…t-option
@faustbrian
chore: wip
f8e2572 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
a2ccd7c 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
132fa1f 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
Merge branch 'refactore-secure-trie-as-an-option' into trie-checkpoin…
a793952 
…t-option
@faustbrian
chore: wip
1dfc5b4 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
94021ed 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
925469b
@faustbrian
chore: wip
4ec3364 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
Merge branch 'refactore-secure-trie-as-an-option' into trie-checkpoin…
b014f34 
…t-option
@faustbrian
refactor(trie): rename secure to useHashedKeys
a50c89c
@faustbrian
Merge branch 'refactore-secure-trie-as-an-option' into trie-checkpoin…
2388783 
…t-option
@faustbrian
chore: wip
906f600 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
refactor(trie): always use CheckpointDB as internal database
29a5445
@faustbrian
chore: wip
f45b020 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
chore: wip
7ceff28 
Signed-off-by: Brian Faust <hello@basecode.sh>
@faustbrian
Merge branch 'unify-db' into trie-checkpoint-option
953b819
@faustbrian faustbrian changed the base branch from master to trie-checkpoint-option August 24, 2022 02:22
@faustbrian faustbrian changed the title root no black magic refactor(trie): combine get/set for root into function Aug 24, 2022
@codecov
Copy link

codecov bot commented Aug 24, 2022 •
edited
Loading

Codecov Report

Merging #2219 (a9d0d8e) into master (fffe4ab) will increase coverage by 0.15%.
The diff coverage is 73.91%.

Impacted file tree graph

Flag Coverage Δ
block 92.98% <100.00%> (ø)
blockchain 88.88% <50.00%> (?)
client 87.00% <100.00%> (ø)
common 59.55% <ø> (ø)
devp2p 92.22% <ø> (-0.11%) ⬇️
ethash ∅ <ø> (∅)
evm 79.07% <ø> (ø)
rlp ∅ <ø> (∅)
statemanager 88.13% <80.00%> (-0.02%) ⬇️
trie 89.72% <68.75%> (-0.23%) ⬇️
tx 97.98% <ø> (ø)
util 92.33% <ø> (ø)
vm 85.24% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@faustbrian faustbrian force-pushed the root-no-black-magic branch from b1c31e3 to 00ddc9d Compare August 24, 2022 02:49
@faustbrian faustbrian mentioned this pull request Aug 24, 2022
Merged
Base automatically changed from trie-checkpoint-option to master August 24, 2022 09:46
@faustbrian faustbrian marked this pull request as ready for review August 24, 2022 10:10
@faustbrian
Copy link
Contributor Author

@holgerd77 conflicts resolved

@faustbrian
Copy link
Contributor Author

Just ran this against my app and its test suite and all good.

@faustbrian faustbrian requested a review from holgerd77 August 24, 2022 10:27
holgerd77
holgerd77 reviewed Aug 24, 2022
View reviewed changes
Copy link
Member

@holgerd77 holgerd77 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be ok with this as well (no approval yet).

Another thing: please please do not open any more breaking refactoring PRs beyond the ones already open. This is all really really great and I am confident that we get this managed, but otherwise this will overload us and the whole release process. 😋

Also others (@jochem-brouwer e.g.) also need to do some separate work towards the releases on Friday, and they need to have some stable code basis for this and do not be distracted/overloaded with merge conflicts or rebases too much.

@faustbrian faustbrian changed the base branch from master to big-messy-bunch August 24, 2022 11:47
@faustbrian faustbrian merged commit 829bd66 into big-messy-bunch Aug 24, 2022
@holgerd77 holgerd77 deleted the root-no-black-magic branch March 2, 2023 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@holgerd77 holgerd77 holgerd77 left review comments

Assignees
No one assigned
Labels
package: mpt PR state: needs review type: refactor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@faustbrian @holgerd77