Skip to content

Merge Dev Into neo-build.dev #4075

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
Closed
wants to merge 30 commits into from
Closed

Merge Dev Into neo-build.dev #4075

wants to merge 30 commits into from

Conversation

@cschuchardt88
Copy link
Member

Description

This is to keep neo-build.dev branch up to date.

  • Update neo-build.dev with dev branch.

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?

  • Test A
  • Test B

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

Wi1l-B0t and others added 30 commits June 16, 2025 09:04
@Wi1l-B0t
Fix: P/Invokes should not be visible (#4003)
538e5b4
@ajara87 @shargon
[Optimization] - Optimize key method (#4001)
14a7c22 
* [Optimization] - Optimize Key method

* Update src/Neo.Cryptography.MPTTrie/Cache.cs

---------

Co-authored-by: Shargon <[email protected]>
@cschuchardt88 @shargon @NGDAdmin
Fix Threading hanging with NeoSystem (#4005)
5a01a56 
* Fix threading hanging with `NeoSystem`

* Fixed for deadlocks

---------

Co-authored-by: Christopher R. Schuchardt <[email protected]>
Co-authored-by: Shargon <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
@Wi1l-B0t @shargon
Style: unify json init style (#4004)
f864e8a 
Co-authored-by: Jimmy <[email protected]>
Co-authored-by: Shargon <[email protected]>
@shargon
Update packages (#4006)
0dad015 
* Update packages

* more

* clean

---------

Co-authored-by: Jimmy <[email protected]>
@vncoelho @cschuchardt88
@shargon @Wi1l-B0t @Jim8y
Restore DBFTPlugin Unit Tests (ConsensusService and Consensus Context) (
1ebd85d 
#3473)

* Initial comit

* Fix paths

* Added `Neo.Plugins.DBFTPlugin.Tests` to `Neo` internals

* Added tests to github workflow

* Akka deps

* Advancing

* TestWallet is mocked

* Adding more steps

* Fixed Test mocking

* Timestamp testing

* Header and TestProbe

* format

* Huge advance! Test probe is now working. Now we go

* dotnet format

* Header looks like to be correct now

* Workaround for dbft settings

* build the mock system for solenode

* update to 7 nodes network mock system

* Comment original tests of the PR

* [`ut`] 100% Coverage Trie.Get (#3952)

* 100% Coverage Trie.Get

* fix ut

* feat: Add comprehensive DBFT consensus unit tests

- Add 34 comprehensive unit tests covering all DBFT scenarios
- Test normal consensus flows, abnormal scenarios, and recovery mechanisms
- Include Byzantine fault tolerance testing (f=1 and f=2 failures)
- Add network partition and message loss simulation
- Implement stress testing with multiple rounds and large transaction sets
- Create professional test infrastructure with TestWallet and ConsensusTestHelper
- Add comprehensive README documentation
- Ensure 100% test pass rate with robust error handling
- Cover complete DBFT protocol: PrepareRequest → PrepareResponse → Commit flow
- Validate view changes, recovery requests, and state synchronization

Test Coverage:
- UT_ConsensusService.cs (7 tests): Service lifecycle and message handling
- UT_DBFT.cs (6 tests): Basic consensus scenarios
- UT_DBFT_Integration.cs (4 tests): Integration scenarios
- UT_DBFT_NormalFlow.cs (3 tests): Complete normal consensus flows
- UT_DBFT_AbnormalScenarios.cs (4 tests): Failure and attack scenarios
- UT_DBFT_Recovery.cs (6 tests): Recovery mechanisms
- UT_DBFT_Robustness.cs (4 tests): Stress and edge case testing

All tests pass: 34/34 ✅

* chore: Update .NET SDK version to 9.0.203

- Update global.json to use .NET SDK 9.0.203 (from 9.0.102)
- Ensures compatibility with latest .NET 9 features and fixes

* fix: Revert .NET SDK version to 9.0.102

- Revert global.json to use .NET SDK 9.0.102 (available on build system)
- Ensures compatibility with current development environment
- Previous version 9.0.203 was not available on the build system

* style: Update copyright year to 2025

- Run dotnet format to apply code formatting standards
- Update copyright year in RecoveryMessageExtensions.cs from 2024 to 2025
- Maintain consistent code formatting across the project

* chore: Update .NET SDK version to 9.0.300

- Update global.json to use .NET SDK 9.0.300 (from 9.0.102)
- Ensures compatibility with latest .NET 9 features and improvements
- Maintains project build consistency with updated SDK

* fix: Resolve RpcServer test compilation errors

- Add Neo.IO using statement for ToHexString extension method
- Comment out problematic ToHexString calls in test setup
- Ensure RpcServer tests can compile alongside DBFT tests
- Maintain DBFT test functionality (34/34 tests passing)

* fix: Complete RpcServer test compilation fix

- Ensure all ToHexString extension method issues are resolved
- Maintain compatibility with DBFT tests (34/34 passing)
- Fix build errors in RpcServer test suite

* Revert changes except DBFT plugin tests

- Reverted all source files to match dev branch
- Reverted test files in Neo.UnitTests and Neo.Plugins.RpcServer.Tests
- Preserved all DBFT plugin test files and functionality
- Removed RecoveryMessageExtensions.cs (not in dev branch)

* Fix DBFT plugin tests API compatibility and accessibility

- Made ConsensusService class internal for test accessibility
- Added InternalsVisibleTo attributes for Neo core and DBFT plugin
- Updated test constructors to use current dev branch API:
  - Fixed NeoSystem constructor (2-parameter instead of 6-parameter)
  - Fixed Settings constructor to use IConfigurationSection
  - Added Microsoft.Extensions.Configuration packages
- Created TestBlockchain.CreateDefaultSettings() helper method
- Updated all test files to use compatible API calls
- All 1,401 tests passing including 34 DBFT plugin tests
- Code formatted with dotnet format

* Add comprehensive DBFT consensus message flow tests

- Implement proper consensus message flow monitoring as requested in GitHub comment
- Add UT_DBFT_ProperMessageFlow.cs with professional, working tests
- Update ConsensusTestHelper with async methods for natural message flow
- Clean up comments and code formatting with dotnet format
- All 38 DBFT plugin tests passing

Tests now properly:
- Send PrepareRequest and wait for natural PrepareResponse
- Monitor actual consensus message flow instead of forcing it
- Handle message validation, service resilience, and lifecycle testing
- Use simplified but effective message capture mechanism

* Update src/Plugins/DBFTPlugin/DBFTPlugin.csproj

Co-authored-by: Christopher Schuchardt <[email protected]>

* Update src/Plugins/DBFTPlugin/DBFTPlugin.csproj

* refactor: Enhance DBFT consensus unit tests to professional standards - Consistent UT_xxx naming convention for all test files - Mock* pattern for all helper/utility classes - Enhanced assertions (7→19, +171% improvement) - Removed duplicate test methods (~140 lines eliminated) - Professional documentation aligned with implementation - Fixed project file syntax (InternalsVisibleTo) - 100% test pass rate maintained (34/34 tests) - Ready for production deployment

* Convert DBFT unit tests from xUnit to MSTest framework

- Remove xUnit package references (xunit, xunit.runner.visualstudio, Akka.TestKit.Xunit2)
- Add Akka.TestKit.MsTest package reference
- Update all test files to use MSTest TestKit instead of xUnit
- Fix test runner configuration to resolve "Zero tests ran" issue
- All 34 tests now pass successfully with MSTest framework
- Maintain existing test structure and TestKit inheritance

* Update DBFT unit tests README for MSTest framework

- Document MSTest framework usage instead of xUnit
- Update prerequisites to include MSTest and Akka.NET TestKit (MSTest version)
- Add note about Visual Studio Test Explorer integration
- Update performance timing to reflect current test execution (~33s)
- Emphasize production-ready testing capabilities

* Fix copyright header filenames in DBFT tests

- Correct UT_DBFT_Performance.cs header (was UT_DBFT_Robustness.cs)
- Correct UT_DBFT_Failures.cs header (was UT_DBFT_AbnormalScenarios.cs)
- Fix other copyright headers to match actual filenames
- Applied via dotnet format to ensure consistency

* Update tests/Neo.Plugins.DBFTPlugin.Tests/Neo.Plugins.DBFTPlugin.Tests.csproj

* Update tests/Neo.Plugins.DBFTPlugin.Tests/UT_DBFT_Core.cs

* Update tests/Neo.Plugins.DBFTPlugin.Tests/UT_DBFT_MessageFlow.cs

* Update tests/Neo.Plugins.DBFTPlugin.Tests/UT_DBFT_MessageFlow.cs

* Add coverage

---------

Co-authored-by: Christopher Schuchardt <[email protected]>
Co-authored-by: Jimmy <[email protected]>
Co-authored-by: Shargon <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: Jimmy <[email protected]>
@Wi1l-B0t
Style: move MPT Benchamrk Project to benchmarks/ (#4011)
6d59406
@shargon @cschuchardt88
[improve] nullable app logs (#4008)
6d711c0 
* nullable app logs

* Update src/Plugins/ApplicationLogs/LogReader.cs

Co-authored-by: Christopher Schuchardt <[email protected]>

* Apply suggestions from code review

Co-authored-by: Christopher Schuchardt <[email protected]>

* Update src/Plugins/ApplicationLogs/Settings.cs

Co-authored-by: Christopher Schuchardt <[email protected]>

---------

Co-authored-by: Christopher Schuchardt <[email protected]>
@Wi1l-B0t
Fix: remove FluentAssertions in notary tests (#4014)
67915b2
@Wi1l-B0t @shargon
@NGDAdmin @cschuchardt88
Add: SignClient Vsock support (#4002)
7036374 
* Add: SignClient vsock support

* optimize: add const string

* optimize: use Uri parse endpoint

---------

Co-authored-by: Shargon <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
Co-authored-by: Christopher Schuchardt <[email protected]>
@Wi1l-B0t
Comments: add Exception info for numeric ops (#4021)
6c7f6c4
@shargon @cschuchardt88 @Jim8y
Isolate ApplicationEngine events (#4016)
cb56508 
* Isolate Log Event

* Isolate instance events

* clean

* Update src/Neo/SmartContract/ApplicationEngine.cs

Co-authored-by: Christopher Schuchardt <[email protected]>

* Apply suggestions from code review

Co-authored-by: Christopher Schuchardt <[email protected]>

* Fix compile

* udate format

* Unify names

---------

Co-authored-by: Christopher Schuchardt <[email protected]>
Co-authored-by: Jimmy <[email protected]>
Co-authored-by: jimmy <[email protected]>
@shargon
Cache nuget packages (#4034)
4790594 
* Cache nuget packages

* move

* Update main.yml

* Update main.yml
@Wi1l-B0t @cschuchardt88 @shargon
Style: more standard code style for Neo.VM (#4022)
e5229fe 
Co-authored-by: Christopher Schuchardt <[email protected]>
Co-authored-by: Shargon <[email protected]>
@Wi1l-B0t @shargon
Optimize: more semantics description and better impl for 'TestBit(thi…
6c35bf8 
…s BigInteger value, int index)' (#4031)

Co-authored-by: Shargon <[email protected]>
@shargon
Improve exception messages throughout Neo codebase (#4032)
852771d 
* Improve exception messages throughout Neo codebase

- Standardize exception message format for consistency
- Make messages more descriptive and professional
- Remove oversimplified and verbose exception messages
- Improve developer experience with clearer error context
- Apply consistent patterns for similar validation types
- Update messages across CLI, Smart Contracts, Cryptography, VM, and other modules

This change improves the quality of error reporting while maintaining
technical accuracy and providing better debugging information.

* Remove PR description file

* Improve exception messages in ECPoint.cs - only message content updated, no code logic changes

* format

* Fix UPnP unit test to expect InvalidOperationException

- Updated UT_UPnP.cs test to expect InvalidOperationException instead of Exception
- This aligns with the improved exception handling implemented in UPnP.cs
- Fixes test failure caused by more specific exception types
- All 1511 tests now pass successfully

* Update src/Neo.VM/Types/Integer.cs

---------

Co-authored-by: Shargon <[email protected]>
@Wi1l-B0t @shargon
Optimize: impl GetLowestSetBit by TrailingZeroCount if available (#…
0c268ea 
…4030)

* Optimize: impl GetLowestSetBit by TrailingZeroCount if available

* Update src/Neo.Extensions/BigIntegerExtensions.cs

---------

Co-authored-by: Shargon <[email protected]>
@shargon @cschuchardt88
[style] Style neo system (#4040)
37d3b3b 
* Style

* Update .editorconfig

Co-authored-by: Christopher Schuchardt <[email protected]>

* renames

---------

Co-authored-by: Christopher Schuchardt <[email protected]>
@ajara87 @Wi1l-B0t
@Jim8y @shargon @cschuchardt88
Refactor MainService.Vote class (#4036)
31dea06 
* Refactor code and improve styles

* Update src/Neo.CLI/CLI/MainService.Vote.cs

Co-authored-by: Will <[email protected]>

* Apply dotnet format to fix whitespace formatting

- Remove trailing space after method signature
- Ensure proper alignment of expression-bodied member
- Comply with project .editorconfig standards

* Update src/Neo.CLI/CLI/MainService.Vote.cs

* Fix: add null arg to BuildNeoScript from UnVote. Rename BuildNativeScript to BuildNeoScript

---------

Co-authored-by: Jimmy <[email protected]>
Co-authored-by: Will <[email protected]>
Co-authored-by: jimmy <[email protected]>
Co-authored-by: Shargon <[email protected]>
Co-authored-by: Christopher Schuchardt <[email protected]>
@Wi1l-B0t @shargon @cschuchardt88
Doc: add document for plugin SignClient (#4049)
c52eb34 
* Doc: add document for plugin SignClient

* Update docs/plugin-secure-sign-guide.md

Co-authored-by: Shargon <[email protected]>

* Update docs/plugin-secure-sign-guide.md

Co-authored-by: Christopher Schuchardt <[email protected]>

* Update docs/plugin-secure-sign-guide.md

Co-authored-by: Christopher Schuchardt <[email protected]>

* Update docs/plugin-secure-sign-guide.md

Co-authored-by: Christopher Schuchardt <[email protected]>

* Update docs/plugin-secure-sign-guide.md

Co-authored-by: Christopher Schuchardt <[email protected]>

* Fix typo

* Remove unnecessary words

---------

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Christopher Schuchardt <[email protected]>
@cschuchardt88 @NGDAdmin @Wi1l-B0t
[Fix] RcpClient Directories and Naming (#4046)
e74abfd 
Co-authored-by: NGD Admin <[email protected]>
Co-authored-by: Will <[email protected]>
@Wi1l-B0t @NGDAdmin
Optimize: no secaped char for command line input (#4044)
2943818 
Co-authored-by: NGD Admin <[email protected]>
@Wi1l-B0t @shargon
Fix: tx.ToJson no 'cosigners' field (#4051)
1328bb4 
* Fix: tx.ToJson no 'cosigners' field

* Rename methods

---------

Co-authored-by: Shargon <[email protected]>
@Wi1l-B0t @shargon
Fix: not matched error code if argument is null with RpcMethodWithPar…
cfba43d 
…ams (#4052)

Co-authored-by: Shargon <[email protected]>
@cschuchardt88 @shargon
Renamed and Fix Properties with plugins (#4062)
7991b5e 
* Renamed and Fix Properties with plugins

* Update src/Plugins/SignClient/SignSettings.cs

* Format

* Rename @shargon `ServerSettings` to RpcServersSettings`

* Added @shargon suggestion for `DbftSettings`

---------

Co-authored-by: Shargon <[email protected]>
@cschuchardt88 @shargon @NGDAdmin
[Add] Indexer to EvaluationStack (#4050)
3e63b2f 
* [`Add`] Indexer to EvaluationStack

* Added indexer tests

* Added more tests

* Touch ups

* Use indexer instead

* use indexer instead

* Increase checks

* Update EvaluationStack.cs

* fixed @shargon broken code

* Added extra test for bigger value than length of `innerList`

---------

Co-authored-by: Shargon <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
@Wi1l-B0t
Comments: Add detail description for RPC Method (#4054)
e37e142
@cschuchardt88 @Wi1l-B0t @NGDAdmin
[Add] TryCatch & TryCatchThrow Extensions (#4038)
c330319 
* [`Add`] `TryCatch` & `TryCatchThrow` Extensions

* fixes

* Add `TryCatch` to `Peers`

---------

Co-authored-by: Will <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
@Wi1l-B0t @shargon @NGDAdmin
Add: input cli command line with --argument-name argument-value (#4047
a0f5ed0 
)

* Add: input cli command line with --argument-name argument-value

* update help output

---------

Co-authored-by: Shargon <[email protected]>
Co-authored-by: NGD Admin <[email protected]>
@Wi1l-B0t
Optimize: more detail for help command (#4067)
5bdb4c4
@cschuchardt88 cschuchardt88 requested a review from shargon July 19, 2025 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shargon shargon Awaiting requested review from shargon

Assignees

@shargon shargon

Labels

Waiting for Review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@cschuchardt88 @shargon @Wi1l-B0t @ajara87 @vncoelho