Add async gas locking to built-in functions #2233
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
sasurobert
requested changes
Aug 24, 2020
sasurobert
previously approved these changes
Aug 24, 2020
| } | ||
|
|
||
| sc.penalizeUserIfNeeded(tx, txHash, vmInput.CallType, vmInput.GasProvided, vmOutput) | ||
|
|
||
| // Restore gas set aside for the async callback, if any; this amount will | ||
| // still be available to the async callback, even after being penalized for providing too much gas | ||
| vmOutput.GasRemaining += lockedGas |
There was a problem hiding this comment.
Penalization is done in penalizeUserIfNeeded method only if: callType != vmcommon.AsynchronousCall
There was a problem hiding this comment.
Updated the comment.
sasurobert
requested changes
Aug 26, 2020
SebastianMarian
previously approved these changes
Aug 26, 2020
| @@ -1004,6 +1008,12 @@ func (tpn *TestProcessorNode) initInnerProcessors() { | |||
| } | |||
| builtInFuncs, _ := builtInFunctions.CreateBuiltInFunctionContainer(argsBuiltIn) | |||
|
|
|||
| if len(TestBuiltinFunctions) > 0 { | |||
There was a problem hiding this comment.
This "if" is not really necessary
SebastianMarian
previously approved these changes
Aug 26, 2020
sasurobert
requested changes
Aug 26, 2020
| @@ -250,7 +250,7 @@ func (sc *scProcessor) doExecuteSmartContractTransaction( | |||
| snapshot := sc.accounts.JournalLen() | |||
|
|
|||
| var vmInput *vmcommon.ContractCallInput | |||
| vmInput, err = sc.createVMCallInput(tx) | |||
| vmInput, err = sc.createVMCallInput(tx, txHash) | |||
There was a problem hiding this comment.
This is not the original txhash which should be needed in case of async callback.use setOriginalTxHash function
There was a problem hiding this comment.
Correct. Replicated the behavior of setOriginalTxHash() in sc.createVMCallInput().
sasurobert
requested changes
Aug 26, 2020
| @@ -71,6 +71,7 @@ func (sc *scProcessor) createVMCallInput(tx data.TransactionHandler) (*vmcommon. | |||
| vmCallInput.CallType = callType | |||
| vmCallInput.RecipientAddr = tx.GetRcvAddr() | |||
| vmCallInput.Function = function | |||
| vmCallInput.OriginalTxHash = txHash | |||
|
|
|||
There was a problem hiding this comment.
Please set originaltxhash and currentxhash as well.
sasurobert
previously approved these changes
Aug 27, 2020
…etwork/elrond-go into fix-callback-gas-builtin
sasurobert
previously approved these changes
Aug 27, 2020
sasurobert
approved these changes
Aug 27, 2020
SebastianMarian
approved these changes
Aug 27, 2020
LucianMincu
approved these changes
Aug 27, 2020
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.
Lock a specified amount of gas before executing a built-in function, in case the call is asynchronous. The locked gas will be restored after execution, or in case of error. The intention is to keep some gas aside, in order to have a minimum amount left for the async callback.
Extra additions to
integrationTests/vm/arwen/utils.go, to allow easy extraction of info directly from SmartContractResults (TODO: add the same functionality toTestProcessorNode).