Allow Native Contracts to be updated #2942

shargon · 2023-11-05T12:36:32Z

Close #2932
Can be tested with #2925

src/Neo/SmartContract/Native/NativeContract.cs

src/Neo/ProtocolSettings.cs

src/Neo/SmartContract/Native/ContractManagement.cs

Jim8y · 2023-11-06T11:02:52Z

@shargon does this native update still require a resync?

vncoelho

I started reviewing, @shargon,
The changes looks good and compact.

I still did not reach the part where we can call functions from previous versions while re-syncing. Can you pin that for me?
I will soon be back to the code and, then, test it. It will require some good attention.

shargon · 2023-11-06T11:27:37Z

@shargon does this native update still require a resync?

In this version I think that is not required. But I want to remove currentAllowedMethods and I think that we can do it better changing the current offsets and native scripts.

src/Neo/SmartContract/Native/NativeContract.cs

src/Neo/SmartContract/Native/ContractMethodAttribute.cs

src/Neo/SmartContract/Native/NativeContract.cs

shargon · 2024-02-21T10:03:01Z

@superboyiii I promise that now it will work :)

superboyiii · 2024-02-22T08:00:51Z

@shargon All feature works well on my privatenet now. To ensure everything compatible, I will re-check storage on mainnet. Give me 1 more day.

shargon · 2024-02-22T18:04:56Z

@neo-project/core is reviewed?

vncoelho

Since I reviewed I think it is not changed

shargon · 2024-02-23T10:28:34Z

@superboyiii ready?

superboyiii

Mainnet data is compatible.

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

Problem: Consider a hardfork (Echidna in our case) that is: 1. Explicitly ommitted from the node configuration; 2. Given the fact that the set of previous hardforks are explicitly enabled in the node configuration. The problem is that this hardfork is treated as "enabled from genesis" by `IsInitializeBlock` function. This problem is discovered when running N3 mainnet/testnet node with the default configuration on the current master. This behaviour leads to unexected Echidna-related changes being included into the node state starting from genesis block. Here are some data: Hardforks configuration that is used in config.json file: ``` "Hardforks": { "HF_Aspidochelone": 210000, "HF_Basilisk": 2680000, "HF_Cockatrice": 3967000, "HF_Domovoi": 4144000 }, ``` Genesis block state difference between the current master and 3.7 version: ``` Processing directory BlockStorage_0 file BlockStorage_0/dump-block-0.json: block 0, changes length mismatch: 34 vs 41 ``` In particular, there are 7 extra storage items stored in genesis. All these changes relate to new functionality added in Echidna hardfork (Policy extensions, Notary contract and etc.): ``` { "id": -7, "key": "+f///xQi", "state": "Added", "value": "gJaYAA==" }, { "id": -7, "key": "+f///xU=", "state": "Added", "value": "mDo=" }, { "id": -7, "key": "+f///xY=", "state": "Added", "value": "gBY=" }, { "id": -7, "key": "+f///xc=", "state": "Added", "value": "gBQg" }, { "id": -1, "key": "/////wg77DUxEZu6123QRJILDebDGU/hwQ==", "state": "Added", "value": "QAUhAfYhACgUO+w1MRGbutdt0ESSCw3mwxlP4cEohk5FRjNuZW8tY29yZS12My4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4EEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0CdOC1CQQgoBk5vdGFyeUAASABAASgGTkVQLTI3QQJACEEFKAliYWxhbmNlT2ZAAUECKAdhY2NvdW50IQEUIQERIQAgAUEFKAxleHBpcmF0aW9uT2ZAAUECKAdhY2NvdW50IQEUIQERIQEHIAFBBSgZZ2V0TWF4Tm90VmFsaWRCZWZvcmVEZWx0YUAAIQERIQEOIAFBBSgQbG9ja0RlcG9zaXRVbnRpbEACQQIoB2FjY291bnQhARRBAigEdGlsbCEBESEBECEBFSAAQQUoDm9uTkVQMTdQYXltZW50QANBAigEZnJvbSEBFEECKAZhbW91bnQhARFBAigEZGF0YSEAIQL/ACEBHCAAQQUoGXNldE1heE5vdFZhbGlkQmVmb3JlRGVsdGFAAUECKAV2YWx1ZSEBESEC/wAhASMgAEEFKAZ2ZXJpZnlAAUECKAlzaWduYXR1cmUhARIhARAhASogAUEFKAh3aXRoZHJhd0ACQQIoBGZyb20hARRBAigCdG8hARQhARAhATEgAEAAQAFBAgAAQAAoBG51bGw=" }, { "id": -1, "key": "/////wz////2", "state": "Added", "value": "O+w1MRGbutdt0ESSCw3mwxlP4cE=" }, { "id": -10, "key": "9v///wo=", "state": "Added", "value": "jAA=" }, ``` Solution: Since EnsureOmittedHardforks is always applied to configured hardfork values, this function ensures that all omitted hardfork heights are set to 0. We don't need additional checks anywhere and can rely on settings.Hardforks explicitly after that. If hardfork is not in settings.Hardforks then it is disabled. Originaly it was an intention of #2942 (comment), but somehow we missed this bug during review. Signed-off-by: Anna Shaleva <[email protected]>

Problem: Consider a hardfork (Echidna in our case) that is: 1. Explicitly ommitted from the node configuration; 2. Given the fact that the set of previous hardforks are explicitly enabled in the node configuration. The problem is that this hardfork is treated as "enabled from genesis" by `IsInitializeBlock` function. This problem is discovered when running N3 mainnet/testnet node with the default configuration on the current master. This behaviour leads to unexected Echidna-related changes being included into the node state starting from genesis block. Here are some data: Hardforks configuration that is used in config.json file (given this config, Echidna should be treated as disabled): ``` "Hardforks": { "HF_Aspidochelone": 210000, "HF_Basilisk": 2680000, "HF_Cockatrice": 3967000, "HF_Domovoi": 4144000 }, ``` Genesis block state difference between the current master and 3.7 version: ``` Processing directory BlockStorage_0 file BlockStorage_0/dump-block-0.json: block 0, changes length mismatch: 34 vs 41 ``` In particular, there are 7 extra storage items stored in genesis. All these changes relate to new functionality added in Echidna hardfork (Policy extensions, Notary contract and etc.): ``` { "id": -7, "key": "+f///xQi", "state": "Added", "value": "gJaYAA==" }, { "id": -7, "key": "+f///xU=", "state": "Added", "value": "mDo=" }, { "id": -7, "key": "+f///xY=", "state": "Added", "value": "gBY=" }, { "id": -7, "key": "+f///xc=", "state": "Added", "value": "gBQg" }, { "id": -1, "key": "/////wg77DUxEZu6123QRJILDebDGU/hwQ==", "state": "Added", "value": "QAUhAfYhACgUO+w1MRGbutdt0ESSCw3mwxlP4cEohk5FRjNuZW8tY29yZS12My4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4EEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0CdOC1CQQgoBk5vdGFyeUAASABAASgGTkVQLTI3QQJACEEFKAliYWxhbmNlT2ZAAUECKAdhY2NvdW50IQEUIQERIQAgAUEFKAxleHBpcmF0aW9uT2ZAAUECKAdhY2NvdW50IQEUIQERIQEHIAFBBSgZZ2V0TWF4Tm90VmFsaWRCZWZvcmVEZWx0YUAAIQERIQEOIAFBBSgQbG9ja0RlcG9zaXRVbnRpbEACQQIoB2FjY291bnQhARRBAigEdGlsbCEBESEBECEBFSAAQQUoDm9uTkVQMTdQYXltZW50QANBAigEZnJvbSEBFEECKAZhbW91bnQhARFBAigEZGF0YSEAIQL/ACEBHCAAQQUoGXNldE1heE5vdFZhbGlkQmVmb3JlRGVsdGFAAUECKAV2YWx1ZSEBESEC/wAhASMgAEEFKAZ2ZXJpZnlAAUECKAlzaWduYXR1cmUhARIhARAhASogAUEFKAh3aXRoZHJhd0ACQQIoBGZyb20hARRBAigCdG8hARQhARAhATEgAEAAQAFBAgAAQAAoBG51bGw=" }, { "id": -1, "key": "/////wz////2", "state": "Added", "value": "O+w1MRGbutdt0ESSCw3mwxlP4cE=" }, { "id": -10, "key": "9v///wo=", "state": "Added", "value": "jAA=" }, ``` Solution: Since EnsureOmittedHardforks is always applied to configured hardfork values, this function ensures that all omitted hardfork heights are set to 0. We don't need additional checks anywhere and can rely on settings.Hardforks explicitly after that. If hardfork is not in settings.Hardforks then it is disabled. Originaly it was an intention of #2942 (comment), but somehow we missed this bug during review. Signed-off-by: Anna Shaleva <[email protected]>

Problem: Consider a hardfork (Echidna in our case) that is: 1. Explicitly ommitted from the node configuration; 2. Given the fact that the set of previous hardforks are explicitly enabled in the node configuration. The problem is that this hardfork is treated as "enabled from genesis" by `IsInitializeBlock` function. This problem is discovered when running N3 mainnet/testnet node with the default configuration on the current master. This behaviour leads to unexected Echidna-related changes being included into the node state starting from genesis block. Here are some data: Hardforks configuration that is used in config.json file (given this config, Echidna should be treated as disabled): ``` "Hardforks": { "HF_Aspidochelone": 210000, "HF_Basilisk": 2680000, "HF_Cockatrice": 3967000, "HF_Domovoi": 4144000 }, ``` Genesis block state difference between the current master and 3.7 version: ``` Processing directory BlockStorage_0 file BlockStorage_0/dump-block-0.json: block 0, changes length mismatch: 34 vs 41 ``` In particular, there are 7 extra storage items stored in genesis. All these changes relate to new functionality added in Echidna hardfork (Policy extensions, Notary contract and etc.): ``` { "id": -7, "key": "+f///xQi", "state": "Added", "value": "gJaYAA==" }, { "id": -7, "key": "+f///xU=", "state": "Added", "value": "mDo=" }, { "id": -7, "key": "+f///xY=", "state": "Added", "value": "gBY=" }, { "id": -7, "key": "+f///xc=", "state": "Added", "value": "gBQg" }, { "id": -1, "key": "/////wg77DUxEZu6123QRJILDebDGU/hwQ==", "state": "Added", "value": "QAUhAfYhACgUO+w1MRGbutdt0ESSCw3mwxlP4cEohk5FRjNuZW8tY29yZS12My4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4EEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0CdOC1CQQgoBk5vdGFyeUAASABAASgGTkVQLTI3QQJACEEFKAliYWxhbmNlT2ZAAUECKAdhY2NvdW50IQEUIQERIQAgAUEFKAxleHBpcmF0aW9uT2ZAAUECKAdhY2NvdW50IQEUIQERIQEHIAFBBSgZZ2V0TWF4Tm90VmFsaWRCZWZvcmVEZWx0YUAAIQERIQEOIAFBBSgQbG9ja0RlcG9zaXRVbnRpbEACQQIoB2FjY291bnQhARRBAigEdGlsbCEBESEBECEBFSAAQQUoDm9uTkVQMTdQYXltZW50QANBAigEZnJvbSEBFEECKAZhbW91bnQhARFBAigEZGF0YSEAIQL/ACEBHCAAQQUoGXNldE1heE5vdFZhbGlkQmVmb3JlRGVsdGFAAUECKAV2YWx1ZSEBESEC/wAhASMgAEEFKAZ2ZXJpZnlAAUECKAlzaWduYXR1cmUhARIhARAhASogAUEFKAh3aXRoZHJhd0ACQQIoBGZyb20hARRBAigCdG8hARQhARAhATEgAEAAQAFBAgAAQAAoBG51bGw=" }, { "id": -1, "key": "/////wz////2", "state": "Added", "value": "O+w1MRGbutdt0ESSCw3mwxlP4cE=" }, { "id": -10, "key": "9v///wo=", "state": "Added", "value": "jAA=" }, ``` Solution: Since EnsureOmittedHardforks is always applied to configured hardfork values, this function ensures that all omitted hardfork heights are set to 0. We don't need additional checks anywhere and can rely on settings.Hardforks explicitly after that. If hardfork is not in settings.Hardforks then it is disabled. Originaly it was an intention of #2942 (comment), but somehow we missed this bug during review. Signed-off-by: Anna Shaleva <[email protected]> Co-authored-by: Jimmy <[email protected]> Co-authored-by: Shargon <[email protected]>

Problem: Consider a hardfork (Echidna in our case) that is: 1. Explicitly ommitted from the node configuration; 2. Given the fact that the set of previous hardforks are explicitly enabled in the node configuration. The problem is that this hardfork is treated as "enabled from genesis" by `IsInitializeBlock` function. This problem is discovered when running N3 mainnet/testnet node with the default configuration on the current master. This behaviour leads to unexected Echidna-related changes being included into the node state starting from genesis block. Here are some data: Hardforks configuration that is used in config.json file (given this config, Echidna should be treated as disabled): ``` "Hardforks": { "HF_Aspidochelone": 210000, "HF_Basilisk": 2680000, "HF_Cockatrice": 3967000, "HF_Domovoi": 4144000 }, ``` Genesis block state difference between the current master and 3.7 version: ``` Processing directory BlockStorage_0 file BlockStorage_0/dump-block-0.json: block 0, changes length mismatch: 34 vs 41 ``` In particular, there are 7 extra storage items stored in genesis. All these changes relate to new functionality added in Echidna hardfork (Policy extensions, Notary contract and etc.): ``` { "id": -7, "key": "+f///xQi", "state": "Added", "value": "gJaYAA==" }, { "id": -7, "key": "+f///xU=", "state": "Added", "value": "mDo=" }, { "id": -7, "key": "+f///xY=", "state": "Added", "value": "gBY=" }, { "id": -7, "key": "+f///xc=", "state": "Added", "value": "gBQg" }, { "id": -1, "key": "/////wg77DUxEZu6123QRJILDebDGU/hwQ==", "state": "Added", "value": "QAUhAfYhACgUO+w1MRGbutdt0ESSCw3mwxlP4cEohk5FRjNuZW8tY29yZS12My4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4EEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0AQQRr3e2dAEEEa93tnQBBBGvd7Z0CdOC1CQQgoBk5vdGFyeUAASABAASgGTkVQLTI3QQJACEEFKAliYWxhbmNlT2ZAAUECKAdhY2NvdW50IQEUIQERIQAgAUEFKAxleHBpcmF0aW9uT2ZAAUECKAdhY2NvdW50IQEUIQERIQEHIAFBBSgZZ2V0TWF4Tm90VmFsaWRCZWZvcmVEZWx0YUAAIQERIQEOIAFBBSgQbG9ja0RlcG9zaXRVbnRpbEACQQIoB2FjY291bnQhARRBAigEdGlsbCEBESEBECEBFSAAQQUoDm9uTkVQMTdQYXltZW50QANBAigEZnJvbSEBFEECKAZhbW91bnQhARFBAigEZGF0YSEAIQL/ACEBHCAAQQUoGXNldE1heE5vdFZhbGlkQmVmb3JlRGVsdGFAAUECKAV2YWx1ZSEBESEC/wAhASMgAEEFKAZ2ZXJpZnlAAUECKAlzaWduYXR1cmUhARIhARAhASogAUEFKAh3aXRoZHJhd0ACQQIoBGZyb20hARRBAigCdG8hARQhARAhATEgAEAAQAFBAgAAQAAoBG51bGw=" }, { "id": -1, "key": "/////wz////2", "state": "Added", "value": "O+w1MRGbutdt0ESSCw3mwxlP4cE=" }, { "id": -10, "key": "9v///wo=", "state": "Added", "value": "jAA=" }, ``` Solution: Since EnsureOmittedHardforks is always applied to configured hardfork values, this function ensures that all omitted hardfork heights are set to 0. We don't need additional checks anywhere and can rely on settings.Hardforks explicitly after that. If hardfork is not in settings.Hardforks then it is disabled. Originaly it was an intention of neo-project#2942 (comment), but somehow we missed this bug during review. Signed-off-by: Anna Shaleva <[email protected]> Co-authored-by: Jimmy <[email protected]> Co-authored-by: Shargon <[email protected]>

shargon added 5 commits November 5, 2023 13:35

Update manifest

24b181f

Fix comment

3c6a1f0

Format & fix methods

a5772bc

Fix new

95335e0

Initialize storage fixes

7ae51e1

shargon requested review from AnnaShaleva and Jim8y November 5, 2023 14:01

shargon added 4 commits November 5, 2023 15:03

Fix IsInitializeBlock

22d72b5

Fix update

c7602c6

Fix GetContractState

b573a00

Optimize

3adddd2

shargon marked this pull request as ready for review November 5, 2023 14:15

Fix first invoke without sync

984d3d7

shargon commented Nov 5, 2023

View reviewed changes

src/Neo/SmartContract/Native/NativeContract.cs Outdated Show resolved Hide resolved

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/ProtocolSettings.cs Show resolved Hide resolved

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/ContractManagement.cs Show resolved Hide resolved

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/ContractManagement.cs Outdated Show resolved Hide resolved

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/ContractManagement.cs Outdated Show resolved Hide resolved

vncoelho reviewed Nov 6, 2023

View reviewed changes

vncoelho mentioned this pull request Nov 6, 2023

Adding keccak256 #2925

Merged

Remove current methods

6341bad

shargon mentioned this pull request Nov 6, 2023

Add factory to GetState neo-project/neo-vm#515

Merged

shargon commented Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/NativeContract.cs Outdated Show resolved Hide resolved

shargon added 2 commits November 6, 2023 12:51

Clean usings

4f59c43

Improve reading Initialize

c85a1cc

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/ContractMethodAttribute.cs Show resolved Hide resolved

Clean OnManifestCompose

2490280

vncoelho reviewed Nov 6, 2023

View reviewed changes

src/Neo/SmartContract/Native/NativeContract.cs Show resolved Hide resolved

shargon added 2 commits February 21, 2024 10:38

Merge branch 'master' into update-native-contracts

d00f510

Fix update

8bcda87

shargon added the Blocker Issues that are blocking other issues. Check issues details to see what it is blocking. label Feb 22, 2024

This was referenced Feb 22, 2024

Make public GetCommitteeAddress #3153

Closed

Expose committee address #3154

Merged

vncoelho approved these changes Feb 22, 2024

View reviewed changes

shargon added 2 commits February 23, 2024 01:54

Merge branch 'master' into update-native-contracts

40c5d97

Merge branch 'master' into update-native-contracts

ef43618

superboyiii approved these changes Feb 23, 2024

View reviewed changes

shargon merged commit b467613 into master Feb 23, 2024

shargon deleted the update-native-contracts branch February 23, 2024 11:31

roman-khimov mentioned this pull request Mar 4, 2024

Emit "Deploy" notification for native contracts #2834

Closed

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 9, 2024

native: emit Deploy/Update notifications on native deploy/update

f087bde

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 9, 2024

native: emit Deploy/Update notifications on native deploy/update

0a01f05

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva mentioned this pull request Apr 13, 2024

SmartContract: fix native NEP-17 manifest construction #3195

Merged

10 tasks

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 18, 2024

native: emit Deploy/Update notifications on native deploy/update

c9955ff

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 18, 2024

native: emit Deploy/Update notifications on native deploy/update

146f3de

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 18, 2024

native: emit Deploy/Update notifications on native deploy/update

c7969ea

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva mentioned this pull request Apr 24, 2024

Perform native contract initialization for the set of hardforks #3200

Closed

AnnaShaleva added a commit to nspcc-dev/neo-go that referenced this pull request Apr 25, 2024

native: emit Deploy/Update notifications on native deploy/update

73c742a

Ported as a part of neo-project/neo#2942. Signed-off-by: Anna Shaleva <[email protected]>

AnnaShaleva mentioned this pull request May 3, 2024

Improve native contract update mechanism #3210

Closed

AnnaShaleva mentioned this pull request Apr 23, 2025

Native: adjust hardfork activation definition #3910

Merged

10 tasks

Uh oh!

Allow Native Contracts to be updated #2942

Allow Native Contracts to be updated #2942

Uh oh!

Conversation

shargon commented Nov 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Jim8y commented Nov 6, 2023

Uh oh!

vncoelho left a comment

Choose a reason for hiding this comment

Uh oh!

shargon commented Nov 6, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shargon commented Feb 21, 2024

Uh oh!

superboyiii commented Feb 22, 2024

Uh oh!

shargon commented Feb 22, 2024

Uh oh!

vncoelho left a comment

Choose a reason for hiding this comment

Uh oh!

shargon commented Feb 23, 2024

Uh oh!

superboyiii left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

shargon commented Nov 5, 2023 •

edited

Loading