Migrate state module to TS #496
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
holgerd77
approved these changes
Apr 16, 2019
| @@ -1,10 +1,13 @@ | |||
| const Buffer = require('safe-buffer').Buffer | |||
| const asyncLib = require('async') | |||
There was a problem hiding this comment.
That's actually a better naming.
| if (it.node) { | ||
| this._cache = it.update({ | ||
| val: val, | ||
| modified: modified, | ||
| deleted: deleted | ||
| }) | ||
| } else { | ||
| this._cache = this._cache.insert(key, { | ||
| this._cache = this._cache.insert(keyHex, { | ||
| val: val, | ||
| modified: modified, | ||
| deleted: deleted |
| const touched = this._touchedStack.pop() | ||
| if (!touched) { | ||
| throw new Error('Reverting to invalid state checkpoint failed') | ||
| } |
There was a problem hiding this comment.
Note: new error on revert introduced here.
| const address = Buffer.from(addressHex, 'hex') | ||
| this.accountIsEmpty(address, (err, empty) => { | ||
| this.accountIsEmpty(address, (err: Error, empty: boolean) => { | ||
| if (err) { | ||
| next(err) | ||
| return |
| const addressHex = address.toString('hex') | ||
| const keyHex = key.toString('hex') | ||
|
|
||
| this._stateManager.getContractStorage(address, key, (err, current) => { | ||
| this._stateManager.getContractStorage(address, key, (err: Error, current: any) => { | ||
| if (err) return cb(err) | ||
|
|
||
| let map = null |
| return promisify(this._wrapped.accountIsEmpty.bind(this._wrapped))(address) | ||
| } | ||
|
|
||
| cleanupTouchedAccounts () { | ||
| cleanupTouchedAccounts (): Promise<void> { | ||
| return promisify(this._wrapped.cleanupTouchedAccounts.bind(this._wrapped))() | ||
| } | ||
| } |
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 migrates the files in the
statemodule to typescript. It also updatesethereumjs-accountto make use of its type definitions.Side question: What do you think about deprecating
ethereumjs-accountand adding it as a module to the VM? (it'd be possible to publish it separately to npm if desired when we migrate to a monorepo).(To be merged into #479)