runtime-sdk/modules/contracts: Fix subcall dispatch #1066
Merged
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
Codecov Report
@@ Coverage Diff @@
## main #1066 +/- ##
==========================================
- Coverage 68.17% 66.80% -1.38%
==========================================
Files 128 127 -1
Lines 11101 11000 -101
==========================================
- Hits 7568 7348 -220
- Misses 3501 3620 +119
Partials 32 32
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
kostko
force-pushed
the
kostko/fix/subcall-dispatch-feechecks
branch
3 times, most recently
from
0b59482
to
1d42a37
Compare
pro-wh
reviewed
Aug 8, 2022
| @@ -513,7 +513,9 @@ impl Runtime for ContractRuntime { | |||
| } | |||
|
|
|||
| #[test] | |||
| fn test_hello_contract_subcalls() { | |||
| fn test_hello_contract_subcalls_overflow() { | |||
There was a problem hiding this comment.
ℹ️ apparently this was always a stack overflow test. this renames it to something more descriptive. in the same change, we're adding a new non-stack-overflow test with the old name
| }; | ||
| ctx.with_tx(0, 0, tx, |mut tx_ctx, call| { | ||
| let result = Contracts::tx_call(&mut tx_ctx, cbor::from_value(call.body).unwrap()) | ||
| .expect("call should succeed"); |
There was a problem hiding this comment.
ℹ️ same test as above except once: true and it succeeds
|
|
||
| // Skip additional checks/gas payment for internally generated transactions. | ||
| if ctx.is_internal() && !ctx.is_simulation() { | ||
| return Ok(()); |
There was a problem hiding this comment.
if things later get more complex, we should move subsets of the checking logic, e.g. the gas price checking and signature verification gas use, to helper functions and call them inside if blocks instead of early returning
Previously various gas and fee checks were performed even for internal subcalls (e.g. when smart contracts called into other modules) which was wrong and also caused failures due to minimum gas price not being met (the fee is always set to zero for subcalls).
kostko
force-pushed
the
kostko/fix/subcall-dispatch-feechecks
branch
from
1d42a37
to
6bde461
Compare
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.
Previously various gas and fee checks were performed even for internal
subcalls (e.g. when smart contracts called into other modules) which
was wrong and also caused failures due to minimum gas price not being
met (the fee is always set to zero for subcalls).