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

3.2.1#705

Merged
erikzhang merged 20 commits intomasterfrom
3.2.1
Apr 21, 2022
Merged

3.2.1#705
erikzhang merged 20 commits intomasterfrom
3.2.1

Conversation

@superboyiii
Copy link
Member

No description provided.

Ashuaidehao and others added 16 commits December 15, 2021 10:27
* init

* upgrade neo

* useDiagnostic

* Update RpcServer.SmartContract.cs

* invoke tree

* add event

* Add storage changes

* Update nuget

* rename event state

* Unify

* update neofs

* fix json

Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Erik Zhang <erik@neo.org>
Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
* add in file copyright

* fix the copyright

* update copyright start year

* Delete copyright.sh

* Delete copyright.txt

Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Co-authored-by: Erik Zhang <erik@neo.org>
* init

* refac

Co-authored-by: Shargon <shargon@gmail.com>
* add log when exception happens under debug mode (#686)

* Revert "add log when exception happens under debug mode (#686)" (#689)

This reverts commit 7b661e5.

* Prevent SSRF

* Update OracleHttpsProtocol.cs

* remove goto

* Remove redundant code

* Remove empty line

Co-authored-by: Jinghui Liao <jinghui@wayne.edu>
Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Co-authored-by: Erik Zhang <erik@neo.org>
* add log when exception happens under debug mode (#686)

* Revert "add log when exception happens under debug mode (#686)" (#689)

This reverts commit 7b661e5.

* limit free gas

* update limit

Co-authored-by: Jinghui Liao <jinghui@wayne.edu>
Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Co-authored-by: Shargon <shargon@gmail.com>
Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Follow ExecFeeFactor changes for MaxBlockSystemFee and make it possible to fit
5K transactions into the block. Related to neo-project/neo-node#850.

Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
* Fix StateAPI.MakeFindStatesParams

* change style to match old code closer
Co-authored-by: Shargon <shargon@gmail.com>
…ration (#701)

Co-authored-by: Erik Zhang <erik@neo.org>
* Limit result stack

* More

* Waiting for release

* Clean code

* Update config.json

* Update Settings.cs

* Move the exception message to `exception` field

* fix

* Update Settings.cs

* Revert the version number

Co-authored-by: Owen Zhang <38493437+superboyiii@users.noreply.github.com>
Co-authored-by: Erik Zhang <erik@neo.org>
Co-authored-by: superboyiii <573504781@qq.com>
* fix MaxBlockSystemFee

* decrease to 2000 GAS

* 1500

* fix Settings
shargon
shargon previously approved these changes Apr 18, 2022
Jim8y
Jim8y previously approved these changes Apr 18, 2022
@erikzhang erikzhang changed the base branch from develop to master April 19, 2022 00:18
@erikzhang erikzhang dismissed stale reviews from Jim8y and shargon April 19, 2022 00:18

The base branch was changed.

Jim8y
Jim8y previously approved these changes Apr 19, 2022
erikzhang
erikzhang previously approved these changes Apr 20, 2022
@erikzhang
Copy link
Member

Wait for #698

* Add global timeout

* Change to counter

* Clean using

* Add Erik's feedback

* Use MaxTaskTimeout

* Create new field

* Increase timeout
@superboyiii
Copy link
Member Author

@erikzhang merge?

@erikzhang erikzhang merged commit 81eb9b7 into master Apr 21, 2022
@erikzhang erikzhang deleted the 3.2.1 branch April 21, 2022 06:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants