Skip to content
This repository was archived by the owner on Nov 10, 2025. It is now read-only.

Add NotaryAssisted transaction attribute type#884

Closed
AnnaShaleva wants to merge 2 commits intoneo-project:masterfrom
AnnaShaleva:notary-assisted
Closed

Add NotaryAssisted transaction attribute type#884
AnnaShaleva wants to merge 2 commits intoneo-project:masterfrom
AnnaShaleva:notary-assisted

Conversation

@AnnaShaleva
Copy link
Member

Port neo-project/neo#3175.
Ref. neo-project/neo#2896.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
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.

@shargon
Copy link
Member

shargon commented May 21, 2024

Repository moved to neo, please re-open there

@shargon shargon closed this May 21, 2024
NGDAdmin added a commit to neo-project/neo that referenced this pull request Mar 4, 2025
* 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 added a commit to cschuchardt88/neo that referenced this pull request Jun 8, 2025
* 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>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants