Skip to content

Add Support for Plugin Loading by Assembly#3755

Merged
shargon merged 12 commits intoneo-project:masterfrom
cschuchardt88:fix/plugins-loading-assembly
Feb 17, 2025
Merged

Add Support for Plugin Loading by Assembly#3755
shargon merged 12 commits intoneo-project:masterfrom
cschuchardt88:fix/plugins-loading-assembly

Conversation

@cschuchardt88
Copy link
Member

@cschuchardt88 cschuchardt88 commented Feb 13, 2025

Description

The EnableDynamicLoading property indicates that an assembly is a dynamically loaded component. The component could be a COM library or a non-COM library that can be used from a native host or used as a plugin. Setting this property to true has the following effects:

  • A .runtimeconfig.json file is generated.
  • RollForward is set to LatestMinor.
  • NuGet references are copied locally.

Added property below to all the plugins.

<EnableDynamicLoading>true</EnableDynamicLoading>

Fixes # (issue)

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

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

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.

Move to Directory.Build.props?

@cschuchardt88
Copy link
Member Author

Move to Directory.Build.props?

I will....

shargon
shargon previously approved these changes Feb 13, 2025
@shargon shargon self-requested a review February 13, 2025 11:28
nan01ab
nan01ab previously approved these changes Feb 13, 2025
@nan01ab
Copy link
Contributor

nan01ab commented Feb 13, 2025

LGTM

@shargon
Copy link
Member

shargon commented Feb 13, 2025

Move to Directory.Build.props?

I will....

Before merge please

@cschuchardt88 cschuchardt88 dismissed stale reviews from shargon and nan01ab via 3b7b167 February 13, 2025 16:51
@cschuchardt88
Copy link
Member Author

Move to Directory.Build.props?

I will....

Before merge please

DONE!!! 😃

@cschuchardt88 cschuchardt88 added the Needs Reapproved Already "ready for merge" label Feb 13, 2025
shargon
shargon previously approved these changes Feb 13, 2025
nan01ab
nan01ab previously approved these changes Feb 14, 2025
@cschuchardt88 cschuchardt88 removed the Needs Reapproved Already "ready for merge" label Feb 14, 2025
Copy link
Member

@vncoelho vncoelho left a comment

Choose a reason for hiding this comment

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

check conflict

@shargon shargon dismissed stale reviews from nan01ab and themself via c85ebd8 February 16, 2025 15:16
@shargon shargon merged commit fe0f732 into neo-project:master Feb 17, 2025
7 checks passed
AnnaShaleva pushed a commit to AnnaShaleva/neo that referenced this pull request Feb 19, 2025
* 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>
NGDAdmin added a commit 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
* 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>
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 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.

6 participants