interop/contract: fix state rollbacks for nested contexts #3046
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Our wrapping optimization relied on the caller context having a TRY block,
but each context (including internal calls!) has an exception handling stack
of its own, which means that for an invocation stack of
entry
A.someMethodFromEntry() # this one has a TRY
A.internalMethodViaCALL() # this one doesn't
B.someMethod()
we get `HasTryBlock() == false` for `A.internalMethodViaCALL()` context, which
leads to missing wrapper and missing rollbacks if B is to THROW. What this
patch does instead is it checks for any context within contract boundaries.
Fixes #3045.
Signed-off-by: Roman Khimov <[email protected]>
cthulhu-rider
approved these changes
Jun 29, 2023
| if topctx == nil { | ||
| topctx = ictx | ||
| } | ||
| if ictx.sc != topctx.sc { |
There was a problem hiding this comment.
micro: this always false if condition above is true
There was a problem hiding this comment.
Yeah, but it's a feature. We always check the top context.
| func (v *VM) ContractHasTryBlock() bool { | ||
| var topctx *Context // Currently executing context. | ||
| for i := 0; i < len(v.istack); i++ { | ||
| ictx := v.istack[len(v.istack)-1-i] // It's a stack, going backwards like handleException(). |
There was a problem hiding this comment.
maybe it'd be easier to invert i then
There was a problem hiding this comment.
Copy-pasting from handleException is more reliable!
notimetoname
approved these changes
Jun 29, 2023
AnnaShaleva
reviewed
Jul 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Our wrapping optimization relied on the caller context having a TRY block, but each context (including internal calls!) has an exception handling stack of its own, which means that for an invocation stack of
we get
HasTryBlock() == falseforA.internalMethodViaCALL()context, which leads to missing wrapper and missing rollbacks if B is to THROW. What this patch does instead is it checks for any context within contract boundaries.Fixes #3045.