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

Limit result stack#696

Merged
superboyiii merged 18 commits intoneo-project:developfrom
shargon:fix-result-stack
Apr 11, 2022
Merged

Limit result stack#696
superboyiii merged 18 commits intoneo-project:developfrom
shargon:fix-result-stack

Conversation

@shargon
Copy link
Member

@shargon shargon commented Mar 4, 2022

Alternative to #695
Close neo-project/neo#2666

@Jim8y Jim8y mentioned this pull request Mar 7, 2022
Closed
superboyiii
superboyiii previously approved these changes Mar 8, 2022
View reviewed changes
Copy link
Member

@superboyiii superboyiii left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Test: PASS
Successfully synced to the latest block and haven't been stuck.
invoke applicationlog for tx:0x40e171249642639be3e54dd6acfe5948b1d3f240f505e7a3403cdc9bd3e1068a and get the expected response:

{"jsonrpc":"2.0","id":1,"result":{"txid":"0x40e171249642639be3e54dd6acfe5948b1d3f240f505e7a3403cdc9bd3e1068a","executions":[{"trigger":"Application","vmstate":"HALT","exception":null,"gasconsumed":"13053","stack":"error: max stack size reached","notifications":[]}]}}

@superboyiii superboyiii requested a review from erikzhang March 8, 2022 08:48
@erikzhang
Copy link
Member

erikzhang commented Mar 9, 2022

Please check neo-project/neo#2671

@Jim8y Jim8y mentioned this pull request Mar 12, 2022
Closed
@shargon
Copy link
Member Author

shargon commented Mar 17, 2022

Waiting for release neo-project/neo#2671

@superboyiii superboyiii mentioned this pull request Mar 18, 2022
Closed
18 tasks
superboyiii
superboyiii previously approved these changes Mar 29, 2022
View reviewed changes
@superboyiii
Copy link
Member

superboyiii commented Mar 29, 2022

@erikzhang Merge?

@Jim8y
Copy link
Contributor

Jim8y commented Mar 29, 2022 •
edited
Loading

These also need update @shargon

https://github.com/neo-project/neo-express/blob/bbde1ff6b932277fb7ffd5313b12e784edb16d56/src/neoxp/Node/OfflineNode.cs#L127

https://github.com/neo-project/neo-node/blob/115e189008f112a001c651e6737e2241f35c5e0b/neo-gui/GUI/InvokeContractDialog.cs#L93

neo-modules/src/RpcServer/RpcServer.SmartContract.cs

Line 78 in 43298b0

json["stack"] = new JArray(engine.ResultStack.Select(p => ToJson(p, settings.MaxIteratorResultItems)));

https://github.com/neo-project/neo-gui-2.x/blob/b816efbadc9bc731bf5ccd4cb545303bd39aabfa/neo-gui/UI/InvokeContractDialog.cs#L188

https://github.com/neo-project/neo-node/blob/24bd2ccfb7abd6ccdcb2e539a9896d1c3b02a4a7/neo-cli/CLI/MainService.cs#L655

neo-modules/src/RpcServer/RpcServer.Wallet.cs

Line 382 in e99d099

json["stack"] = new JArray(engine.ResultStack.Select(p => p.ToJson()));

https://github.com/neo-project/neo-debugger/blob/bc68ce1b61f5cbcd1ba60f51f1bccc133613f85e/src/adapter2/DebugSession.cs#L480

@erikzhang
Copy link
Member

erikzhang commented Mar 29, 2022

Update config.json too?

erikzhang
erikzhang reviewed Mar 29, 2022
View reviewed changes
@superboyiii
Copy link
Member

superboyiii commented Apr 6, 2022 •
edited
Loading

These also need update @shargon

https://github.com/neo-project/neo-express/blob/bbde1ff6b932277fb7ffd5313b12e784edb16d56/src/neoxp/Node/OfflineNode.cs#L127

https://github.com/neo-project/neo-node/blob/115e189008f112a001c651e6737e2241f35c5e0b/neo-gui/GUI/InvokeContractDialog.cs#L93

neo-modules/src/RpcServer/RpcServer.SmartContract.cs

Line 78 in 43298b0

json["stack"] = new JArray(engine.ResultStack.Select(p => ToJson(p, settings.MaxIteratorResultItems)));

https://github.com/neo-project/neo-gui-2.x/blob/b816efbadc9bc731bf5ccd4cb545303bd39aabfa/neo-gui/UI/InvokeContractDialog.cs#L188
https://github.com/neo-project/neo-node/blob/24bd2ccfb7abd6ccdcb2e539a9896d1c3b02a4a7/neo-cli/CLI/MainService.cs#L655

neo-modules/src/RpcServer/RpcServer.Wallet.cs

Line 382 in e99d099

json["stack"] = new JArray(engine.ResultStack.Select(p => p.ToJson()));

https://github.com/neo-project/neo-debugger/blob/bc68ce1b61f5cbcd1ba60f51f1bccc133613f85e/src/adapter2/DebugSession.cs#L480

@shargon Could you update these as well as config.json

erikzhang
erikzhang previously approved these changes Apr 8, 2022
View reviewed changes
@Jim8y
Copy link
Contributor

Jim8y commented Apr 8, 2022

Are we going to merge this without fixing neo-modules/src/RpcServer/RpcServer.Wallet.cs and neo-modules/src/RpcServer/RpcServer.Wallet.cs?

@erikzhang erikzhang dismissed their stale review April 8, 2022 02:46

RpcServer.Wallet.cs should be fixed.

@superboyiii
Copy link
Member

superboyiii commented Apr 8, 2022 •
edited
Loading

@erikzhang @Liaojinghui Could you have a review?

Jim8y
Jim8y previously approved these changes Apr 8, 2022
View reviewed changes
@superboyiii superboyiii merged commit 62a14eb into neo-project:develop Apr 11, 2022
@shargon shargon deleted the fix-result-stack branch April 11, 2022 08:32
erikzhang pushed a commit that referenced this pull request Apr 21, 2022
@superboyiii
3.2.1 (#705)
81eb9b7 
* add invoked contract (#657)

* add in file copyright (#679)

* witness rule support (#676)

* Prevent SSRF (#692)

* limit free gas (#697)

* add log when exception happens under debug mode (#690)

* dbft: tune MaxBlock* parameters (#688)

* Fix StateAPI.MakeFindStatesParams (#699)

* update Console to ConsoleHelper (#682)

* refac log (#700)

* Make RpcServer.ProcessAsync public to enable better neo express integration (#701)

* Limit result stack (#696)

* fix MaxBlockSystemFee (#703)

* code optimise (#704)

* Add oracle global timeout (#698)
roman-khimov added a commit to nspcc-dev/neo-go that referenced this pull request May 4, 2022
@roman-khimov
rpc: signal JSON marshalling errors through exception
930c439 
See neo-project/neo-modules#696. Unmarshaller is left unchanged to be
compatible.
@roman-khimov roman-khimov mentioned this pull request May 4, 2022
Merged
@roman-khimov roman-khimov mentioned this pull request Nov 30, 2023
Merged
@roman-khimov roman-khimov mentioned this pull request Mar 14, 2024
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@Jim8y Jim8y Jim8y approved these changes

@erikzhang erikzhang erikzhang approved these changes

@superboyiii superboyiii superboyiii left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@shargon @erikzhang @superboyiii @Jim8y