Fix MPT branch node strip after deletion #2034
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
AnnaShaleva
approved these changes
Jul 2, 2021
pkg/core/native/native_nep17.go
Outdated
| @@ -173,11 +173,12 @@ func (c *nep17TokenNative) updateAccBalance(ic *interop.Context, acc util.Uint16 | |||
| return errors.New("insufficient funds") | |||
| } | |||
| si = state.StorageItem{} | |||
| } else if amount.Sign() == 0 && requiredBalance != nil { | |||
| } else if amount.Sign() <= 0 && requiredBalance != nil { | |||
There was a problem hiding this comment.
Maybe it's better to put back si after receiving an error from incBalance? Otherwise we're unwrapping/comparing the balance twice.
There was a problem hiding this comment.
Fixed, forgot to push.
roman-khimov
reviewed
Jul 2, 2021
pkg/core/native/native_nep17.go
Outdated
| @@ -173,11 +173,12 @@ func (c *nep17TokenNative) updateAccBalance(ic *interop.Context, acc util.Uint16 | |||
| return errors.New("insufficient funds") | |||
| } | |||
| si = state.StorageItem{} | |||
| } else if amount.Sign() == 0 && requiredBalance != nil { | |||
| } else if amount.Sign() <= 0 && requiredBalance != nil { | |||
There was a problem hiding this comment.
Maybe it's better to put back si after receiving an error from incBalance? Otherwise we're unwrapping/comparing the balance twice.
Signed-off-by: Evgeniy Stratonikov <evgeniy@nspcc.ru>
Signed-off-by: Evgeniy Stratonikov <evgeniy@nspcc.ru>
If the child left is a hash node, we should retrieve it from store. Signed-off-by: Evgeniy Stratonikov <evgeniy@nspcc.ru>
roman-khimov
approved these changes
Jul 6, 2021
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.
If the only child left is hash node, we need to retrieve it from storage.
Another commit fixes only state dump.
After the restore node seems (waited for a couple of minutes) to be adding state roots without errors.