Skip to content

v3.7.5#3330

Merged
NGDAdmin merged 6 commits intoneo-project:v3.7.5from
superboyiii:v3.7.5
Jun 12, 2024
Merged

v3.7.5#3330
NGDAdmin merged 6 commits intoneo-project:v3.7.5from
superboyiii:v3.7.5

Conversation

@superboyiii
Copy link
Member

@superboyiii superboyiii commented Jun 11, 2024

v3.7.5 hotfix

Jimmy and others added 3 commits June 11, 2024 20:15
* fix 3300

* update format

* add state subitems to ref counter, with suggestion from DuSmart

* apply hardfork

* format

* my mistake

* fix hardfork

* remove negative check

* add unit test

* apply anna's suggestion

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
It's not correct to use an updated contract state got from native
Management to check for the allowed method call. We need to use
manifest from the currently executing context for that. It may be
critical for cases when executing contract is being updated firstly,
and after that it calls another contract. So we need an old (executing)
contract manifest for this check.

This change is moved under D hardfork to avoid state diff issues on
nodes update. Although it should be noted that it's hard to meet the
trigger criteria.

A port of nspcc-dev/neo-go#3473. This bug was
discovered during the similar problem described in
nspcc-dev/neo-go#3471 and fixed in
nspcc-dev/neo-go#3472. I've checked all other
similar usages and the rest of them use proper contract state (executing
one, not the Management's one).

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>
@vncoelho
Copy link
Member

Merge #3320 before, for tests locally to work

@vncoelho
Copy link
Member

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Jun 11, 2024
Ref. neo-project/neo#3330.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Jun 11, 2024
Ref. neo-project/neo#3330.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
Otherwise this configuration file is broken. Port changes from
nspcc-dev/neo-go#3446.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
@superboyiii
Copy link
Member Author

@AnnaShaleva @cschuchardt88 Could you review again?

@superboyiii
Copy link
Member Author

https://github.com/neo-project/neo/pull/3306/files

I mean this one

Not criticial for this hotfix. We can put it into v3.8.0

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.

Otherwise LGTM.

@NGDAdmin NGDAdmin merged commit 2fdf1bb into neo-project:v3.7.5 Jun 12, 2024
Copy link
Member

@shargon shargon left a comment

Choose a reason for hiding this comment

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

LgTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants