Update merkle-patricia-tree to v4, move account trie-related methods to StateManager #787
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
Codecov Report
@@ Coverage Diff @@
## master #787 +/- ##
==========================================
- Coverage 84.40% 84.34% -0.07%
==========================================
Files 19 17 -2
Lines 1257 1233 -24
Branches 249 246 -3
==========================================
- Hits 1061 1040 -21
+ Misses 126 125 -1
+ Partials 70 68 -2
Continue to review full report at Codecov.
|
ryanio
changed the title
This comment has been minimized.
This comment has been minimized.
|
Just had a first look, phew, nice PR! 😄 |
ryanio
force-pushed
the
mpt-v4
branch
2 times, most recently
from
60b5f5c to
67a85b2
Compare
holgerd77
approved these changes
Jun 26, 2020
| @@ -141,7 +144,7 @@ export default class DefaultStateManager implements StateManager { | |||
| async _lookupStorageTrie(address: Buffer): Promise<Trie> { | |||
| // from state trie | |||
| const account = await this.getAccount(address) | |||
| const storageTrie = this._trie.copy() | |||
| const storageTrie = this._trie.copy(false) | |||
There was a problem hiding this comment.
Ok, this one was important to maintain the original behavior.
This was referenced Jun 26, 2020
| @@ -48,7 +48,6 @@ | |||
| "@types/bn.js": "^4.11.6", | |||
| "@types/node": "^11.13.4", | |||
| "@types/tape": "^4.13.0", | |||
| "merkle-patricia-tree": "^3.0.0", | |||
| @@ -43,7 +43,7 @@ | |||
| "@ethereumjs/tx": "^2.1.2", | |||
| "@types/bn.js": "^4.11.6", | |||
| "ethereumjs-util": "^7.0.2", | |||
| "merkle-patricia-tree": "^2.3.2" | |||
| "merkle-patricia-tree": "^4.0.0" | |||
| } | ||
| }) | ||
| }) | ||
| await this.txTrie.put(rlp.encode(txIndex), tx.serialize()) |
There was a problem hiding this comment.
yeah, that's much better :)
| account.balance.toString('hex') === '' && | ||
| account.codeHash.toString('hex') === KECCAK256_NULL_S | ||
| ) | ||
| return account.isEmpty() | ||
| } | ||
|
|
||
| /** |
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.
This PR:
merkle-patricia-treeto v4getCode,setCode,getStorage,setStoragepromisifys