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

Neo.CLI: enable hardforks for NeoFS mainnet #3240

Merged
merged 1 commit into from
May 20, 2024
Merged

Neo.CLI: enable hardforks for NeoFS mainnet #3240

merged 1 commit into from
May 20, 2024

Conversation

AnnaShaleva
Copy link
Member

Description

Otherwise this configuration file is broken. Port changes from nspcc-dev/neo-go#3446.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@AnnaShaleva
Neo.CLI: enable hardforks for NeoFS mainnet
2982394 
Otherwise this configuration file is broken. Port changes from
nspcc-dev/neo-go#3446.

Signed-off-by: Anna Shaleva <[email protected]>
@AnnaShaleva AnnaShaleva added the Bug Used to tag confirmed bugs label May 17, 2024
@AnnaShaleva AnnaShaleva added this to the v3.8.0 milestone May 17, 2024
@Jim8y
Copy link
Contributor

Jim8y commented May 17, 2024

Just asking, why cont fs use the mainnet hf setting?

@vncoelho
Copy link
Member

Just asking, why cont fs use the mainnet hf setting?

Agreed, better to unify this settings into a class later and then just extract the info where we need it.

@AnnaShaleva
Copy link
Member Author

AnnaShaleva commented May 17, 2024 •
edited
Loading

Just asking, why cont fs use the mainnet hf setting?

It's a separate chain with its own settings and block heights, so it needs its own hardfork settings.

@roman-khimov
Copy link
Contributor

It's a separate chain with its own settings

And the fun thing is that it's longer than the "main" mainnet itself:

$ ./bin/neo-go query height -r https://rpc7.morph.fs.neo.org:40341
Latest block: 5701933
Validated state: 0
$ ./bin/neo-go query height -r https://rpc10.n3.nspcc.ru:10331
Latest block: 5396462
Validated state: 5396462

@Jim8y
Copy link
Contributor

Jim8y commented May 18, 2024

@NGDAdmin merge

@shargon shargon merged commit 4da5d6b into master May 20, 2024
6 checks passed
@shargon shargon deleted the enable-Cockatrice-for-neofs branch May 20, 2024 08:46
Jim8y added a commit to Jim8y/neo that referenced this pull request May 25, 2024
@Jim8y
Merge branch 'latest-plugins' of github.com:Jim8y/neo into latest-plu…
4a96d1e 
…gins

* 'latest-plugins' of github.com:Jim8y/neo: (21 commits)
  fix: custom plugins won't shown by command `plugins` (neo-project#3269)
  COVERALL: Improve maintenance and readbility of some variables (neo-project#3248)
  Update nuget (neo-project#3262)
  [**Part-2**] Neo module/master fixes (neo-project#3244)
  Fix `dotnet pack` error (neo-project#3266)
  Fix and Update devcontainer.json to use Dockerfile  (neo-project#3259)
  Add optimization to template (neo-project#3247)
  Optimize plugin's models (neo-project#3246)
  fix CancelTransaction !signers.Any() (neo-project#3263)
  COVERALL: fix broken by changing report from lcov to cobertura (neo-project#3252)
  fix TraverseIterator count (neo-project#3261)
  Native: include DeprecatedIn hardfork into usedHardforks (neo-project#3245)
  [**Part-1**] `neo-module/master` (neo-project#3232)
  Make `ApplicationEngine.LoadContext` protection level `public` (neo-project#3243)
  improve parse method in neo-cli (neo-project#3204)
  Fix neo-project#3239 (neo-project#3242)
  Neo.CLI: enable hardforks for NeoFS mainnet (neo-project#3240)
  v3.7.4 (neo-project#3237)
  fix hardfork issues (neo-project#3234)
  Update src/Neo.CLI/CLI/MainService.Plugins.cs
  ...

# Conflicts:
#	src/Neo.CLI/CLI/MainService.Plugins.cs
cschuchardt88 pushed a commit to cschuchardt88/neo that referenced this pull request Jun 11, 2024
@AnnaShaleva @cschuchardt88
Neo.CLI: enable hardforks for NeoFS mainnet (neo-project#3240)
431540a 
Otherwise this configuration file is broken. Port changes from
nspcc-dev/neo-go#3446.

Signed-off-by: Anna Shaleva <[email protected]>
NGDAdmin added a commit that referenced this pull request Jun 12, 2024
@superboyiii @Jim8y
@shargon @NGDAdmin @AnnaShaleva @vncoelho
v3.7.5 (#3330)
2fdf1bb 
* [Neo Core Bug]fix 3300 (#3301)

* 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 <[email protected]>
Co-authored-by: NGD Admin <[email protected]>

* SmartContract: use executing contract state to check permissions (#3290)

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 <[email protected]>
Co-authored-by: Shargon <[email protected]>
Co-authored-by: Jimmy <[email protected]>
Co-authored-by: Vitor Nazário Coelho <[email protected]>

* v3.7.5

* Neo.CLI: enable hardforks for NeoFS mainnet (#3240)

Otherwise this configuration file is broken. Port changes from
nspcc-dev/neo-go#3446.

Signed-off-by: Anna Shaleva <[email protected]>

* fix workflow & FS config

* remove hardfork for fs testnet

---------

Signed-off-by: Anna Shaleva <[email protected]>
Co-authored-by: Jimmy <[email protected]>
Co-authored-by: Shargon <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
Co-authored-by: Anna Shaleva <[email protected]>
Co-authored-by: Vitor Nazário Coelho <[email protected]>
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

@Jim8y Jim8y Jim8y approved these changes

@vncoelho vncoelho vncoelho approved these changes

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

@cschuchardt88 cschuchardt88 Awaiting requested review from cschuchardt88

@superboyiii superboyiii Awaiting requested review from superboyiii

Assignees
No one assigned
Labels
Bug Used to tag confirmed bugs Ready to Merge
Projects
None yet
Milestone
v3.8.0
Development

Successfully merging this pull request may close these issues.
5 participants
@AnnaShaleva @Jim8y @vncoelho @roman-khimov @shargon