fix trusts conflicts#2892
Merged
shargon merged 7 commits intoneo-project:masterfrom Sep 1, 2023
Jim8y:fix-trusts
Merged
Conversation
roman-khimov
requested changes
Aug 29, 2023
Contributor
roman-khimov
left a comment
There was a problem hiding this comment.
Thanks for an attempt though, this should be fixed one way or another before 3.6.
Contributor
Author
|
should we keep the logic of "of any of the permission is wildcard, then the trust is wildcard" |
added 2 commits
August 30, 2023 13:44
Closed
shargon
previously approved these changes
Aug 31, 2023
Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
AnnaShaleva
approved these changes
Aug 31, 2023
Member
AnnaShaleva
left a comment
There was a problem hiding this comment.
Let's add the Jim8y#1 test, please.
LGTM.
roman-khimov
approved these changes
Aug 31, 2023
Add unit test to check manifest Trusts serialization to stack item
Contributor
Author
|
@superboyiii Good to review and merge. |
shargon
approved these changes
Sep 1, 2023
Member
|
Wait for @superboyiii test |
Member
|
I'm resyncing full data on testnet with this implemented, result will come out soon. |
superboyiii
approved these changes
Sep 1, 2023
Member
superboyiii
left a comment
There was a problem hiding this comment.
Tested OK on my privatenet
Contributor
Author
5 tasks
AnnaShaleva
added a commit
to nspcc-dev/neo-go
that referenced
this pull request
Sep 25, 2023
If manifest trusts presented as Null stackitem, then they should be treated as wildcard, not as restricted. It's not the same problem as described and fixed in neo-project/neo#2901 and neo-project/neo#2892, although these two PRs are related. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Fix #2890