Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix trusts conflicts #2892

Merged
merged 7 commits into from
Sep 1, 2023
Merged

fix trusts conflicts #2892

merged 7 commits into from
Sep 1, 2023

Conversation

Jim8y
Copy link
Contributor

@Jim8y Jim8y commented Aug 29, 2023

Fix #2890

roman-khimov
roman-khimov requested changes Aug 29, 2023
View reviewed changes
Copy link
Contributor

@roman-khimov roman-khimov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for an attempt though, this should be fixed one way or another before 3.6.

src/Neo/SmartContract/Manifest/ContractManifest.cs Outdated Show resolved Hide resolved
@Jim8y
Copy link
Contributor Author

Jim8y commented Aug 30, 2023

should we keep the logic of "of any of the permission is wildcard, then the trust is wildcard"

@superboyiii superboyiii mentioned this pull request Aug 30, 2023
Closed
shargon
shargon previously approved these changes Aug 31, 2023
View reviewed changes
@AnnaShaleva
Add unit test to check manifest Trusts serialization to stack item
6735ee3 
Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
AnnaShaleva
AnnaShaleva approved these changes Aug 31, 2023
View reviewed changes
Copy link
Member

@AnnaShaleva AnnaShaleva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add the Jim8y#1 test, please.

LGTM.

@Jim8y
Merge pull request #1 from AnnaShaleva/test-trust-serialize
63d91f8 
Add unit test to check manifest Trusts serialization to stack item
@Jim8y
Copy link
Contributor Author

Jim8y commented Sep 1, 2023

@superboyiii Good to review and merge.

@shargon
Copy link
Member

shargon commented Sep 1, 2023

Wait for @superboyiii test

@superboyiii
Copy link
Member

I'm resyncing full data on testnet with this implemented, result will come out soon.

superboyiii
superboyiii approved these changes Sep 1, 2023
View reviewed changes
Copy link
Member

@superboyiii superboyiii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested OK on my privatenet

@Jim8y
Copy link
Contributor Author

Jim8y commented Sep 1, 2023

@shargon

@shargon shargon merged commit 5210728 into neo-project:master Sep 1, 2023
2 checks passed
@Jim8y Jim8y deleted the fix-trusts branch September 1, 2023 11:24
@vang1ong7ang vang1ong7ang mentioned this pull request Sep 16, 2023
Closed
5 tasks
AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Sep 25, 2023
@AnnaShaleva
smartcontract: fix wildcard trusts deserialization
2581146 
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>
@AnnaShaleva AnnaShaleva mentioned this pull request Sep 25, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shargon shargon shargon approved these changes

@roman-khimov roman-khimov roman-khimov approved these changes

@AnnaShaleva AnnaShaleva AnnaShaleva approved these changes

@superboyiii superboyiii superboyiii approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Storage fails on a specific contract on Testnet t5
5 participants
@Jim8y @shargon @superboyiii @roman-khimov @AnnaShaleva