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.

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

Squash and merge #11

Merged
merged 183 commits into from
Nov 25, 2020
Merged

Squash and merge #11

merged 183 commits into from
Nov 25, 2020

Conversation

chenzhitong
Copy link
Owner

No description provided.

erikzhang and others added 30 commits June 29, 2018 17:23
After change to Akka consensus in NEO 3.0, it's so fast that seconds do not mean much anymore.. now milliseconds is important to actually know of what is going on the consensus algorithm.
* Rpc Basic Auth

* change plugin name to RpcSecurity
* Including number of dumped states

* Update StatesDumper/StatesDumper.cs

Co-Authored-By: vncoelho <[email protected]>
* Persitence Plugin first draft

* Fixing some compiling problems. Trackable is still not found in the local scope.

* Minnor changes. Trackable still not found

* Fixing all compiling errors and Trackable

* Fixing StorageKey and Item get values

* Switch case Persist Action and fixing Storage export

* Adding Height To Being

* Moving plugin to StatesDumper

* minnor comments

* remove StatesDumper.sln

* format

* remove `Settings.BlockStorageCache`

* add `PersistActions`
* Update packages reference

* Fix claim (#34)
* Ensure PoW correct order for TXs tiebreakers

* ThenByAscending for Hash
shargon and others added 28 commits September 15, 2020 12:04
* upgrade neo-core

* Add statesdumper

Co-authored-by: Shargon <[email protected]>
* compiling, some stuff stubbed out

* more tests working

* MakeTxContext

* mistake in GetBlock/GetBlockHeader

* rework TransactionManager to be closer to original

* more unit tests (2 still failing)

* remove assertEx

* Add ThrowsAsync comment

* ReturnsAsync

* fixed last remaining test issues

* minor TXManager cleanup

* formatting

* move tx contruction to MakeTransaction

* discards

* Async Suffixes (PR feedback)

* GetCommitteeAsync

* add custom magic support to tx manager

* fix format

* add magic param comment

* CR Feedback

* Clean enter

Co-authored-by: Harry <[email protected]>
Co-authored-by: Shargon <[email protected]>
* add magic field in getversion

* fix rpc client

* fix
* fix validateaddress

* apply recommendation

Co-authored-by: Owen Zhang <[email protected]>
* allow rpc method can be overrided

* change to protected virtual

* set DummyWallet private

* Update src/RpcServer/RpcServer.SmartContract.cs

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

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Owen Zhang <[email protected]>
* add null check for transferaddress

* add ut

* fix ut

* fix format

* fix

* merge master

Co-authored-by: Owen Zhang <[email protected]>
* invoke* use base64 script

* fix rpc client

* fix ut

* fix validateaddress

* fix ut

* revert

* fix ProcessInvokeWithWallet

Co-authored-by: Owen Zhang <[email protected]>
* remove sender from invoke method

* fix

* format

Co-authored-by: Owen Zhang <[email protected]>
* add exception field in invokeresult

* fix rpc client

* fix

* fix show exception message

* fix

* fix

* fix: add try-catch for processInvokeWithWallet

* fix

* apply

* trigger github action

* Singers

* fix

Co-authored-by: Owen Zhang <[email protected]>
* optimization code

* conflict resolution 2

* conflict resolution 3

* update

* Update RpcApplicationLog.cs

* Update RpcBlock.cs

* Update RpcBlockHeader.cs

* Optimize return

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Owen Zhang <[email protected]>
…371)

* Update Utility.cs

* Update RpcTestCases.json

* update

Co-authored-by: Owen Zhang <[email protected]>
Use Base64String on response of getrawtransaction
* fixed-bug-1021

* Update src/RpcServer/RpcServer.SmartContract.cs

* 😂

* NEO3: RPC client Policy API mismatch

* update

* update

* update

* UT

* Format

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Owen Zhang <[email protected]>
* Unify base64 in SendRawTransaction and SubmitBlock

* fix GetRpcName() in GetWalletBalanceAsync

* add SubmitBlock

* add ProcessInvokeWithWallet
* fixed-bug-1021

* Update src/RpcServer/RpcServer.SmartContract.cs

* 😂

* Modify container in GetInvokeResult method

* .

* Update src/RpcServer/RpcServer.SmartContract.cs

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

Co-authored-by: Shargon <[email protected]>
Co-authored-by: cloud8little <[email protected]>
* fixed-bug-1021

* Update src/RpcServer/RpcServer.SmartContract.cs

* 😂

* Keeping up to date with neo

* Keeping up to date with neo

* Revert "Keeping up to date with neo"

This reverts commit aa8e120.

* Prevent create key if not null

* dotnet format

* Query application log via blockhash

* update

* Modifying the Json storage structure

* Modifying the JSON storage structure 2

* Additional optional "trigger" parameter to getapplicationlog for clients to be able to get just one execution result for a block.

* Re-run checks

* StrictUTF8

* Update src/ApplicationLogs/LogReader.cs

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

* Optimize

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Luchuan <[email protected]>
Co-authored-by: Vitor Nazário Coelho <[email protected]>
Co-authored-by: Owen Zhang <[email protected]>
* fixed-bug-1021

* Update src/RpcServer/RpcServer.SmartContract.cs

* 😂

* Update RpcApplicationLog.cs in RpcClient

* update

* Fixed UT

* ???

* update

* UT

Co-authored-by: Shargon <[email protected]>
Co-authored-by: Owen Zhang <[email protected]>
Co-authored-by: superboyiii <[email protected]>
* Update LogReader.cs

* update
* Update RpcServer.SmartContract.cs

* Update src/RpcServer/RpcServer.SmartContract.cs

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

* update

Co-authored-by: Owen Zhang <[email protected]>
Co-authored-by: Shargon <[email protected]>
* use shared directory.build.props file

* Update src/LevelDBStore/LevelDBStore.csproj

Co-authored-by: Erik Zhang <[email protected]>

* Update src/RocksDBStore/RocksDBStore.csproj

Co-authored-by: Erik Zhang <[email protected]>

* Update src/RocksDBStore/RocksDBStore.csproj

Co-authored-by: Erik Zhang <[email protected]>

* CR Feedback

* Fix namespace

Co-authored-by: Harry <[email protected]>
Co-authored-by: Erik Zhang <[email protected]>
Co-authored-by: Harry Pierson <[email protected]>
* create helper applog JSON functions for reuse in neo-express

* Update LogReader.cs (#401)

* Update LogReader.cs

* update

Co-authored-by: Harry <[email protected]>
@chenzhitong chenzhitong changed the title update Squash and merge Nov 25, 2020
@chenzhitong chenzhitong merged commit 3543023 into chenzhitong:origin Nov 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.