-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
[Neo Core Bug]fix 3300 #3301
Merged
Merged
[Neo Core Bug]fix 3300 #3301
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
1f8e36a
fix 3300
Jim8y c8d9322
update format
Jim8y 81abdd3
add state subitems to ref counter, with suggestion from DuSmart
Jim8y fde92e6
Merge branch 'master' into fix-3300
shargon ee4c159
apply hardfork
Jim8y d8e12be
Merge branch 'fix-3300' of github.com:Jim8y/neo into fix-3300
Jim8y c723ae1
format
Jim8y dca720b
my mistake
Jim8y 814d334
fix hardfork
Jim8y 0bf9d11
remove negative check
Jim8y afc5349
Merge branch 'master' into fix-3300
shargon 6afd380
add unit test
Jim8y 2e742cc
Merge branch 'fix-3300' of github.com:Jim8y/neo into fix-3300
Jim8y 6529bfa
apply anna's suggestion
Jim8y f471c05
Merge branch 'master' into fix-3300
NGDAdmin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove it, we need to merge #3290 firstly and then rebase this PR onto master.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i will update it if that one is merged first, otherwise this pr will be the one name the hardfork, no problem at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AnnaShaleva don't introduce dependency here imo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just don't like the code duplication between PRs. #3290 is ready for merge and should be included into this release as long as this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Duplicate is because we need to apply a name for the hf, next time maybe you can create a pr to add a hf before fixing anything. But this is not functional related, we can keep it this way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
imagine someday if there's a urgent bug comes, do you think we should wait for another PR just for applying for a HF_CODE
maybe we should have special HF_CODE for hotfixs
maybe we should not mix the HF_CODE assigning pr into another pr
we need more reasonable branch maintain rules i think