Optimize `StorageKey` creation by shargon · Pull Request #3756 · neo-project/neo

shargon · 2025-02-13T10:42:14Z

Description

Now we can remove key builder. StorageKey creation was improved.

Type of change

Optimization (the change is only an optimization)
Style (the change is only a code style for better maintenance or standard purpose)
Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

UT_KeyBuilder.SameTest

Test Configuration:

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

…/neo into optimize-key-builder

src/Neo/SmartContract/KeyBuilder.cs

Co-authored-by: nan01ab <yjcc201374@outlook.com>

src/Neo/SmartContract/KeyBuilder.cs

I didnt pick request changes

src/Neo/SmartContract/KeyBuilder.cs

shargon · 2025-02-17T15:23:39Z

Ping @neo-project/core

@cschuchardt88

* Optimize key builder * Optimize with GetSpan * Use Span * Clean * Rename * Update src/Neo/SmartContract/KeyBuilder.cs Co-authored-by: nan01ab <yjcc201374@outlook.com> * Update KeyBuilder.cs * @cschuchardt88 feedback * Avoid ToArray in StorageKey constructor * Use sizeof * Optimize ECPoint * Optimize ECPoint * Add ISerializableSpan * Move to StorageKey * Use ReadOnlySpan --------- Co-authored-by: nan01ab <yjcc201374@outlook.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

@shargon

* Implement NotaryAssisted transaction attribute Close #2896. Use a stub for native Notary contract hash since this contract is not implemented yet. Thus, technically, NotaryAssisted attribute verification will always fail on real network until native Notary is implemented. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: add doc to CalculateNetworkFee method of NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: add NotaryAssisted attributes handler to Gas OnPersist Transactions network fee should be split between Primary node and Notary nodes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: adjust comment to NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: temporary use hard-coded Notary contract hash Once Notary contract is implemented, this hash will be replaced by a proper Notary contract hash. The exact value won't be changed since Notary contract has constant hash as any other native contract. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: replace hard-coded Notary hash value with calculated one No functional changes, just a refactoring for better code readability. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * NeoModules: integrate NotaryAssisted attribute Port the neo-project/neo-modules#884. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: fix XML comment formatting Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * P2P: move NotaryAssisted transaction attribute under D hardfork Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * P2P: move NotaryAssisted transaction attribute under E hardfork D hardfork was occupied by 3.7.5, thus use the next available one. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * tests: fix build errors No functional changes, just build fixes required by updated master branch. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * NotaryAssisted: update copyright date Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * SmartContract: refactor obsolete code Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Persistance: fix UT Related to additional storage entries added by the previous changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Clean comments * Native: improve exception message for Policy's getFee/setFee Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * EC Recover (#3696) * EC Recover * Clean code * Fix ut * Fix ut * Unify hashing * Allow HashAlgorithm.None * Clean comment * Update src/Neo/Cryptography/Crypto.cs * Fix merge * Add None check * Fix GetHash * fix unit testing issues * Clean code * Update src/Neo/SmartContract/Native/CryptoLib.cs --------- Co-authored-by: Jimmy <jinghui@wayne.edu> * Improve MaxNestingDepth of WitnessCondition (#3761) * tests: add UT for nested WitnessCondition This just works as the code works. Signed-off-by: Roman Khimov <roman@nspcc.ru> * WitnessCondition: unify nesting checks, fix MaxNestingDepth 1. We have some duplication around "maxNestDepth <= 0" checks. 2. If we're to fix them by moving to DeserializeFrom() and thereby affecting all types of conditions we can discover a simple truth about conditions that was hidden previously: our real supported MaxNestingDepth is 3, not 2. 3. Test_WitnessCondition_Nesting works as before, check it there, we have And->And->Boolean and other nesting cases, 3-4 elements in the chain, not 2. Signed-off-by: Roman Khimov <roman@nspcc.ru> * WitnessCondition: unify JSON parsing as well Signed-off-by: Roman Khimov <roman@nspcc.ru> * tests: s/WitnessContition/WitnessCondition/ Fix typo. Signed-off-by: Roman Khimov <roman@nspcc.ru> * Format header * Format arrays in UT_WitnessCondition.cs --------- Signed-off-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> * Add Support for Plugin Loading by Assembly (#3755) * Add Support for plugin loading * Added @shargon request of changes --------- Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> * Optimize `StorageKey` creation (#3756) * Optimize key builder * Optimize with GetSpan * Use Span * Clean * Rename * Update src/Neo/SmartContract/KeyBuilder.cs Co-authored-by: nan01ab <yjcc201374@outlook.com> * Update KeyBuilder.cs * @cschuchardt88 feedback * Avoid ToArray in StorageKey constructor * Use sizeof * Optimize ECPoint * Optimize ECPoint * Add ISerializableSpan * Move to StorageKey * Use ReadOnlySpan --------- Co-authored-by: nan01ab <yjcc201374@outlook.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * [`Fix`] Linux File Access (#3769) * Add some stuff to hope once and for all fix the linux workflows * update workflow * update nuget.yml * Change dig to detailed, log too big * Fix targets * revert main.yml * Update .github/workflows/main.yml * disable BuildInParallel --------- Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Shargon <shargon@gmail.com> * Update src/Neo/SmartContract/Native/PolicyContract.cs * UnitTests: migrate NotaryAssisted test from MSTestV1 to MSTestV2 Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> --------- Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> Signed-off-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> Co-authored-by: nan01ab <yjcc201374@outlook.com>

@cschuchardt88

* Optimize key builder * Optimize with GetSpan * Use Span * Clean * Rename * Update src/Neo/SmartContract/KeyBuilder.cs Co-authored-by: nan01ab <yjcc201374@outlook.com> * Update KeyBuilder.cs * @cschuchardt88 feedback * Avoid ToArray in StorageKey constructor * Use sizeof * Optimize ECPoint * Optimize ECPoint * Add ISerializableSpan * Move to StorageKey * Use ReadOnlySpan --------- Co-authored-by: nan01ab <yjcc201374@outlook.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

@shargon

* Implement NotaryAssisted transaction attribute Close neo-project#2896. Use a stub for native Notary contract hash since this contract is not implemented yet. Thus, technically, NotaryAssisted attribute verification will always fail on real network until native Notary is implemented. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: add doc to CalculateNetworkFee method of NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Native: add NotaryAssisted attributes handler to Gas OnPersist Transactions network fee should be split between Primary node and Notary nodes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: adjust comment to NotaryAssisted attribute Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: temporary use hard-coded Notary contract hash Once Notary contract is implemented, this hash will be replaced by a proper Notary contract hash. The exact value won't be changed since Notary contract has constant hash as any other native contract. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: replace hard-coded Notary hash value with calculated one No functional changes, just a refactoring for better code readability. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * NeoModules: integrate NotaryAssisted attribute Port the neo-project/neo-modules#884. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Payloads: fix XML comment formatting Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * P2P: move NotaryAssisted transaction attribute under D hardfork Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * P2P: move NotaryAssisted transaction attribute under E hardfork D hardfork was occupied by 3.7.5, thus use the next available one. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * tests: fix build errors No functional changes, just build fixes required by updated master branch. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * NotaryAssisted: update copyright date Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * SmartContract: refactor obsolete code Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Persistance: fix UT Related to additional storage entries added by the previous changes. Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * Clean comments * Native: improve exception message for Policy's getFee/setFee Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> * EC Recover (neo-project#3696) * EC Recover * Clean code * Fix ut * Fix ut * Unify hashing * Allow HashAlgorithm.None * Clean comment * Update src/Neo/Cryptography/Crypto.cs * Fix merge * Add None check * Fix GetHash * fix unit testing issues * Clean code * Update src/Neo/SmartContract/Native/CryptoLib.cs --------- Co-authored-by: Jimmy <jinghui@wayne.edu> * Improve MaxNestingDepth of WitnessCondition (neo-project#3761) * tests: add UT for nested WitnessCondition This just works as the code works. Signed-off-by: Roman Khimov <roman@nspcc.ru> * WitnessCondition: unify nesting checks, fix MaxNestingDepth 1. We have some duplication around "maxNestDepth <= 0" checks. 2. If we're to fix them by moving to DeserializeFrom() and thereby affecting all types of conditions we can discover a simple truth about conditions that was hidden previously: our real supported MaxNestingDepth is 3, not 2. 3. Test_WitnessCondition_Nesting works as before, check it there, we have And->And->Boolean and other nesting cases, 3-4 elements in the chain, not 2. Signed-off-by: Roman Khimov <roman@nspcc.ru> * WitnessCondition: unify JSON parsing as well Signed-off-by: Roman Khimov <roman@nspcc.ru> * tests: s/WitnessContition/WitnessCondition/ Fix typo. Signed-off-by: Roman Khimov <roman@nspcc.ru> * Format header * Format arrays in UT_WitnessCondition.cs --------- Signed-off-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> * Add Support for Plugin Loading by Assembly (neo-project#3755) * Add Support for plugin loading * Added @shargon request of changes --------- Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> * Optimize `StorageKey` creation (neo-project#3756) * Optimize key builder * Optimize with GetSpan * Use Span * Clean * Rename * Update src/Neo/SmartContract/KeyBuilder.cs Co-authored-by: nan01ab <yjcc201374@outlook.com> * Update KeyBuilder.cs * @cschuchardt88 feedback * Avoid ToArray in StorageKey constructor * Use sizeof * Optimize ECPoint * Optimize ECPoint * Add ISerializableSpan * Move to StorageKey * Use ReadOnlySpan --------- Co-authored-by: nan01ab <yjcc201374@outlook.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> * [`Fix`] Linux File Access (neo-project#3769) * Add some stuff to hope once and for all fix the linux workflows * update workflow * update nuget.yml * Change dig to detailed, log too big * Fix targets * revert main.yml * Update .github/workflows/main.yml * disable BuildInParallel --------- Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Shargon <shargon@gmail.com> * Update src/Neo/SmartContract/Native/PolicyContract.cs * UnitTests: migrate NotaryAssisted test from MSTestV1 to MSTestV2 Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> --------- Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru> Signed-off-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: Jimmy <jinghui@wayne.edu> Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com> Co-authored-by: Roman Khimov <roman@nspcc.ru> Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com> Co-authored-by: nan01ab <yjcc201374@outlook.com>

Optimize key builder

8abd53a

shargon requested a review from Jim8y February 13, 2025 10:42

shargon added 4 commits February 13, 2025 12:16

Optimize with GetSpan

8b49b1d

Merge branch 'master' into optimize-key-builder

92aa290

Use Span

8c95207

Merge branch 'optimize-key-builder' of https://github.com/neo-project…

c293204

…/neo into optimize-key-builder

shargon added the Waiting for Review label Feb 13, 2025

shargon added 2 commits February 13, 2025 12:41

Clean

100afe5

Rename

fbe36a6

nan01ab reviewed Feb 13, 2025

View reviewed changes

src/Neo/SmartContract/KeyBuilder.cs Outdated Show resolved Hide resolved

shargon and others added 4 commits February 13, 2025 14:20

Update src/Neo/SmartContract/KeyBuilder.cs

37f80e5

Co-authored-by: nan01ab <yjcc201374@outlook.com>

Update KeyBuilder.cs

df404d1

Merge branch 'master' into optimize-key-builder

f94f0a4

Merge branch 'master' into optimize-key-builder

93b7ec2

cschuchardt88 previously requested changes Feb 14, 2025

View reviewed changes

src/Neo/SmartContract/KeyBuilder.cs Outdated Show resolved Hide resolved

cschuchardt88 reviewed Feb 14, 2025

View reviewed changes

src/Neo/SmartContract/KeyBuilder.cs Show resolved Hide resolved

shargon and others added 10 commits February 14, 2025 02:55

Merge branch 'master' into optimize-key-builder

f703723

@cschuchardt88 feedback

0239be3

Avoid ToArray in StorageKey constructor

31bd1fe

Use sizeof

1ba6ef3

Merge branch 'master' into optimize-key-builder

5bb2fe9

Merge branch 'master' into optimize-key-builder

734dbb9

Optimize ECPoint

9a72e73

Optimize ECPoint

791d9b1

Add ISerializableSpan

2c1274e

Merge branch 'master' into optimize-key-builder

6903d12

shargon commented Feb 15, 2025

View reviewed changes

src/Neo/SmartContract/KeyBuilder.cs Outdated Show resolved Hide resolved

Move to StorageKey

9cbac9f

shargon removed the Waiting for Review label Feb 15, 2025

shargon added the Waiting for Review label Feb 15, 2025

shargon changed the title ~~Optimize key builder~~ Optimize StorageKey creation Feb 15, 2025

shargon added 3 commits February 15, 2025 12:04

Use ReadOnlySpan

2e5183f

Merge branch 'master' into optimize-key-builder

6ed3997

Merge branch 'master' into optimize-key-builder

a0dfe7d

nan01ab approved these changes Feb 17, 2025

View reviewed changes

shargon added Ready to Merge and removed Waiting for Review labels Feb 17, 2025

Jim8y approved these changes Feb 18, 2025

View reviewed changes

shargon merged commit 6f9ef50 into master Feb 18, 2025
7 checks passed

shargon deleted the optimize-key-builder branch February 18, 2025 09:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optimize `StorageKey` creation#3756

Optimize `StorageKey` creation#3756
shargon merged 25 commits intomasterfrom
optimize-key-builder

shargon commented Feb 13, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shargon commented Feb 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

shargon commented Feb 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

How Has This Been Tested?

Checklist:

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shargon commented Feb 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

shargon commented Feb 13, 2025 •

edited

Loading