EN-8181/ReturnData-to-transfer-for-callback #2898
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
cmd/node/config/config.toml
Outdated
| # ReturnDataToLastTransferEnableEpoch represents the epoch when return data is added to last output transfer for callbacks | ||
| ReturnDataToLastTransferEnableEpoch = 5 | ||
|
|
||
| # ArwenESDTFunctionsEnableEpoch represents the epoch the new ESDT functions are enabled in arwen |
There was a problem hiding this comment.
the epoch when the new ?
cmd/node/config/config.toml
Outdated
| @@ -52,6 +52,12 @@ | |||
| # BlockGasAndFeesReCheckEnableEpoch represents the epoch when gas and fees used in each created or processed block are re-checked | |||
| BlockGasAndFeesReCheckEnableEpoch = 4 | |||
|
|
|||
| # ReturnDataToLastTransferEnableEpoch represents the epoch when return data is added to last output transfer for callbacks | |||
process/smartContract/process.go
Outdated
| @@ -1808,7 +1812,7 @@ func (sc *scProcessor) useLastTransferAsAsyncCallBackWhenNeeded( | |||
| tx data.TransactionHandler, | |||
| result *smartContractResult.SmartContractResult, | |||
| ) bool { | |||
| if len(vmOutput.ReturnData) > 0 { | |||
| if len(vmOutput.ReturnData) > 0 && sc.flagReturnDataToLastTransfer.IsSet() { | |||
There was a problem hiding this comment.
!sc.flagReturnDataToLastTransfer.IsSet() ?
SebastianMarian
approved these changes
Mar 11, 2021
iulianpascalau
approved these changes
Mar 11, 2021
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.
Added new flags and fixed a scenario which was not treated the same way as in arwen.