Skip to content
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

Merge Master into new-cli repo #3556

Merged
merged 93 commits into from
Oct 26, 2024
Merged

Merge Master into new-cli repo #3556

merged 93 commits into from
Oct 26, 2024

Conversation

cschuchardt88
Copy link
Member

Description

Merge master into new-cli

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

cschuchardt88 and others added 30 commits July 1, 2024 09:45
@cschuchardt88
Remove comments in nuget.yml (#3359)
ae998ee 
* Fixed Typo in `nuget.yml`

* reverted for path
@shargon
Fix: MemPool null checks (#3367)
5f66404 
* Fix null error

* Add [MaybeNullWhen(false)]

* Update MemoryPool.cs
@chenzhitong @shargon
plugins: remove expressions that are always true (#3393)
96c9e77 
* this expression is always true

* Improve

---------

Co-authored-by: Shargon <shargon@gmail.com>
@cschuchardt88 @Jim8y @NGDAdmin
[**Part-1] Add github Release Workflow (#3308)
20b7409 
* Added `release.yml`

* Fixed `release.yml`

* Remove `VersionPrefix`

* Added macos leveldb

* Fixed

* Remove comments on the command-line

* Fixed `CodeSign` `neo-cli`

* Added steps for `codesign` in `release.yml`

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@shargon @NGDAdmin
cli: Fix plugins command (#3394)
a80fca6 
* Fix plugin list

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

---------

Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @Jim8y @shargon
Added blame logging for dotnet test (#3384)
188028b 
Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: Shargon <shargon@gmail.com>
@superboyiii @cschuchardt88
@Jim8y @NGDAdmin @shargon
Fix download tips (#3395)
5a14bf2 
* Added `release.yml`

* Fixed `release.yml`

* Remove `VersionPrefix`

* Added macos leveldb

* Fixed

* Remove comments on the command-line

* Fixed `CodeSign` `neo-cli`

* Added steps for `codesign` in `release.yml`

* Add downloading plugin tips

* Change to ConsoleHelper

* Move before first download

---------

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
@shargon @Jim8y @NGDAdmin
DeprecatedIn for events (#3362)
b7bc07b 
* DeprecatedIn for events

* Added UT

* Remove using

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@chenzhitong @shargon
@cschuchardt88 @NGDAdmin
Fix crash when comparing ContractPermissionDescriptor (#3396)
2c20820 
* Update ContractPermissionDescriptor.cs

* Add UT

---------

Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com>
Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon
@lingyido @NGDAdmin
[neo-cli] Error Message and Warning - LevelDb (#3380)
c537f87 
* Fixed warnings and error message for `libleveldb` missing

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

Co-authored-by: lingyido <lingyido@gmail.com>

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: lingyido <lingyido@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @NGDAdmin
Fixed Props Pathing for dotnet pack with nuget (#3379)
8e1e661 
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon @NGDAdmin
Part-1 Neo.IO - move (#3387)
15d36b7 
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon
[Fix] Test Problems (#3398)
94f1a72 
* Fix Test crashes

* disable Build servers

* Fixed Building problem with tests

* Fixed command line

* Removed disable build servers

---------

Co-authored-by: Shargon <shargon@gmail.com>
@cschuchardt88 @shargon @NGDAdmin
[Typo] Unit Tests - UT_ProtocolSettings.CreateHKSettings (#3383)
e5abfa1 
* Typeo with `CreateHKSettings`

* fix ut

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@dependabot
Bump System.Text.Json from 8.0.3 to 8.0.4 in /src/Neo.Json (#3416)
c54c204 
Bumps System.Text.Json from 8.0.3 to 8.0.4.

---
updated-dependencies:
- dependency-name: System.Text.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Jim8y @cschuchardt88
@NGDAdmin @shargon
[Neo Plugin Store] Unit test (#3399)
1c45832 
* test

* fix snapshot issue and add tests

* fix test

* apply old snapshot

* remove duplicate

* Remove method

---------

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
@cschuchardt88 @shargon @NGDAdmin
[Add] Debug Output to Expect (#3407)
97e24ed 
* Added Debug to Expect

* Update file paths

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@chenzhitong @cschuchardt88
@Jim8y @shargon @NGDAdmin
Improve code coverage (#3354)
bfb3440 
* update

* remove binary file

* Add UT and fixed bug

* Add UT and fixed bug

* Add UT

* Add UT

* Add UT

* Update src/Neo/SmartContract/Manifest/ContractManifest.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

* Update src/Neo/SmartContract/Manifest/ContractManifest.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

* Update src/Neo/SmartContract/Manifest/ContractManifest.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

* Update Base58.cs

* Update UT_Cryptography_Helper.cs

* Update Base58.cs

* update

* Update ContractManifest.cs

* Revert change that affect a syscall

* Revert try

* Remove using

* Update src/Neo/SmartContract/Manifest/ContractManifest.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

* Update src/Neo/SmartContract/Manifest/ContractAbi.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

* Update src/Neo/SmartContract/Manifest/ContractManifest.cs

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>

---------

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@Jim8y @shargon @NGDAdmin
[Neo Plugin UT] Rpcserver unit test on node (#3353)
3351533 
* try mock

* not use mock

* test

* fix test

* use neo testutils

* complete rpcserver blockchain tests.

* revert change to ByteArrayComparer

* revert cache change

* add more detail to comments

* add more exception test cases

* fix warning

* Apply suggestions from code review

* update TODO mark

* add node rpc tests

* fix build error

* set the mempool to 5.

* remove memory pool test.

* fix tests

* fix test issue

* Update tests/Neo.UnitTests/TestUtils.Transaction.cs

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@shargon
Fix release compilation (#3417)
06e087f 
* Fix release

* typo
@cschuchardt88 @NGDAdmin
Fixed Publish Step (#3411)
53eaa39 
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@Jim8y @cschuchardt88
@NGDAdmin @shargon
[Neo Core MemoryStore] MemoryStore Unit Tests. (#3404)
bf50823 
* test

* fix snapshot issue and add tests

* fix test

* apply old snapshot

* memory snapshot tests

* memory test

* add more tests

* make it more clear

* revert storetest

---------

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
@Jim8y @shargon
[Neo Core Storage] Implicit methods and tests (#3403)
6c29bde 
* implicit methods and tests

* udpate

---------

Co-authored-by: Shargon <shargon@gmail.com>
@Jim8y @shargon @NGDAdmin
[Neo Core Store] Rename various snapshots. (#3406)
096f472 
* rename snapshot

* Remove warning

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon @Jim8y
[Move] Part-2 Classes into Different Library - Neo.IO (#3388)
03fc303 
* Part-1 `Neo.IO` - move

* Part-2

* Added `BigInteger` to `Neo.Extensions`

* Found more `BigInteger`

* Added Tests

* Update tests/Neo.Extensions.Tests/UT_BigIntegerExtensions.cs

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@vncoelho @cschuchardt88
Revert "Plugin unhandled exception (#3349)" (#3366)
f307a31 
This reverts commit b2f060f.

Co-authored-by: Christopher Schuchardt <cschuchardt88@gmail.com>
@Jim8y
fix obsolete warning (#3428)
e73fc00
@AnnaShaleva @NGDAdmin
Neo.CLI: update MaxTraceableBlocks setting for NeoFS networks (#3424)
79a539f 
We don't need long tails for NeoFS networks, 3 days is enough for now.
It's checked that this change does not affect the network states.

Port nspcc-dev/neo-go#3518.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @NGDAdmin
Upgrade nuget packages (#3421)
d0a2028 
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@Jim8y @shargon @NGDAdmin
[Neo Core Fix]use strong randomness (#3432)
d8a4564 
* use strong randomness

* Update src/Plugins/DBFTPlugin/Consensus/ConsensusContext.MakePayload.cs

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
cschuchardt88 and others added 24 commits September 27, 2024 10:48
@cschuchardt88 @Jim8y
@shargon @NGDAdmin
[Add] Transaction Builder (#3477)
73cea01 
* Added Builders with tests

* Added SignerBuilder and started WitnessRuleBuilder

* Added `WitnessConditionBuilder` with tests

* Added more logic

* Fixed `SignerBuilder` class

* Code touch ups

* Added more tests

* Update src/Neo/Builders/TransactionBuilder.cs

* Fixed `And` `Or` and `Not` conditions

* Fixed Memory leak

* Added error message for Witness scripts

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon @NGDAdmin
[Fix] Neo Plugins github nuget (#3493)
6a4ea1f 
* Fixed Delete packages for github

* Automatic

* added continue-on-error: true

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 @shargon @Jim8y
[Move] Part-5 Classes into Different Library - Neo.Extensions (#3409
9287c66 
)

* Part-1 `Neo.IO` - move

* Part-2

* Added `BigInteger` to `Neo.Extensions`

* Found more `BigInteger`

* Added `ByteArray` to `Neo.Extensions`

* Added `DateTime` Extensions to `Neo.Extensions`

* Added `HashSetExtensions`, `HashSetExtensions2`, `IpAddressExtensions`, `AssemblyExtensions`, `StringExtensdions`
Deleted `Helper.cs` file

* Added `ICollection`, `Memory`,  `String`, `Unsafe` extensions

* Adding `using`

* dotnet format

* Added Tests

* Added `tests` from `Part-2`

* Added `tests` for `PART-4`

* Added `tests` for `PART-5`

* Made changes and fixes

* Fixes

* Apply suggestions from code review

* Update tests/Neo.Extensions.Tests/UT_StringExtensions.cs

* @shagron review changes

* formating

* Moved `UnsafeData` tests to `UT_UnsafeData`

* Formating

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@nan01ab
fix: always throw DivideByZeroException when BloomFilter is empty (
33d0913 
#3502)

* fix: always throw divided by zero when BloomFilter is empty

* fix: always throw divided by zero when BloomFilter is empty
@nan01ab @shargon @Jim8y
fix: concurrency conflict in MemPool.TryRemoveUnVerified (#3500)
6e74e33 
* fix: concurrency conflict in MemPool.TryRemoveUnVerified

* Remove method

* Update src/Neo/Ledger/MemoryPool.cs

* clean

* Apply suggestions from code review

* reformat

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@Jim8y
update rvcount error message (#3504)
1688a7a
@cschuchardt88 @Jim8y
@NGDAdmin @shargon
Added CreateStruct & Fixed CreateMap (#3494)
a38d618 
* Added `CreateStruct`, Fixed CreateMap

* Added test and comments

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
@Jim8y
benchmark convert (#3509)
bb32a79
@AnnaShaleva @Jim8y
OpCodes: extend MODMUL tests with negative base/multiplier/mod (#3513)
6067f67 
Allows to avoid bugs like
nspcc-dev/neo-go#3598.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@nan01ab @shargon @Jim8y
fix: sensitive data compare should use constant time compare to avoid…
331fa24 
… timing attack (#3508)

* fix: pass compare should use contant time compare to avoid timing attack

* fix: pass compare should use contant time compare to avoid timing attack

* Update src/Plugins/RpcServer/RpcServer.cs

* Update src/Plugins/RpcServer/RpcServer.cs

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@shargon @Jim8y
Related to #3508 (comment) (#3516)
a817e29 
Co-authored-by: Jimmy <jinghui@wayne.edu>
@Jim8y @shargon
[Benchmark] this pr adds more pocs to benchmark (#3512)
8290697 
* this pr adds more pocs to benchmark

* format

---------

Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com>
@dependabot @NGDAdmin @shargon
Bump System.Text.Json from 8.0.4 to 8.0.5 in /src/Neo.Json (#3519)
52393be 
Bumps [System.Text.Json](https://github.com/dotnet/runtime) from 8.0.4 to 8.0.5.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v8.0.4...v8.0.5)

---
updated-dependencies:
- dependency-name: System.Text.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
@Hecate2 @shargon
Circular reference error info in ToJson (#3522)
5d2d8da 
Co-authored-by: Shargon <shargon@gmail.com>
@Jim8y @shargon
[Benchmark] Benchmark OpCode and VM (#3514)
20c8661 
* add opcode benchmark system

* add opcode benchmark system

* update to make the framework easier to work with.

* Clean code

* filescope namespace

* remove uncomplet benchmark

* add missing using

---------

Co-authored-by: Fernando Diaz Toledano <shargon@gmail.com>
@shargon
Move ReferenceCounter to an interface (#3524)
018e17b 
* Reference counter V2

* Remove warning

* Interface

* Change to interface

* Update

* Remove V2
@Jim8y @shargon
[Neo VM] optimize newstruct (#3525)
a326939 
* optimize newstruct

* use Array.Fill

* Update src/Neo.VM/JumpTable/JumpTable.Compound.cs

---------

Co-authored-by: Shargon <shargon@gmail.com>
@nan01ab
fea: use canonical TryGet style in IReadOnlyStore (#3533)
b752efe
@shargon @Jim8y
Add references (#3529)
3f2f78c 
Co-authored-by: Jimmy <jinghui@wayne.edu>
@nan01ab @shargon @Jim8y
fix: concurrency conflict in NEP6Wallet.ToJson (#3527)
bb71676 
* fix: concurrency conflict in NEP6Wallet.ToJson

* Update also ChangePasssword

* Reduce lock time

---------

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Jimmy <jinghui@wayne.edu>
@Hecate2
fix cref "OpCode.SUBSTR" in comment (#3542)
16bde11
@Hecate2 @Jim8y @shargon
ApplicationEngine helper to get engine error info (#3541)
6d7ea43 
* helper to get engine error info

* cancel try

* Update src/Neo/SmartContract/ApplicationEngine.Helper.cs

Co-authored-by: Shargon <shargon@gmail.com>

* standalone method to get exception stack trace and message

* always return string

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: Shargon <shargon@gmail.com>
@Hecate2 @Jim8y
stack opcode example comments (#3546)
85f52f5 
* stack opcode example comments

* move index into example

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
@shargon @Jim8y @NGDAdmin
Expose GetInteropDescriptor (#3545)
9ed6cac 
* Expose GetInteropDescriptor

* Update src/Neo/SmartContract/ApplicationEngine.cs

---------

Co-authored-by: Jimmy <jinghui@wayne.edu>
Co-authored-by: NGD Admin <154295625+NGDAdmin@users.noreply.github.com>
@cschuchardt88 cschuchardt88 changed the title Merge Master into new-cli Merge Master into new-cli repo Oct 25, 2024
@Jim8y Jim8y merged commit 0dd6127 into new-cli Oct 26, 2024
79 checks passed
shargon
shargon reviewed Oct 26, 2024
View reviewed changes
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.

LgTm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shargon shargon shargon left review comments

@Jim8y Jim8y Awaiting requested review from Jim8y

Assignees
No one assigned
Labels
Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@cschuchardt88 @shargon @Jim8y @chenzhitong @superboyiii @vncoelho @AnnaShaleva @Hecate2 @kov072299 @nan01ab