fix gasUsed and fee for relayed v1 and v2 #6556
Merged
Conversation
This file contains hidden or 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
sstanculeanu
added
the
ignore-for-release-notes
miiu96
reviewed
Oct 24, 2024
| continue | ||
| } | ||
|
|
||
| if isSCRForSenderWithRefund(scr, txHashHex, txWithResults.GetTxHandler()) || isRefundForRelayed(scr, txWithResults.GetTxHandler()) { |
Contributor
There was a problem hiding this comment.
can you check if this fix also works for a relayed TX with a cross-shard inner transaction and the refund SCR is generated a few blocks later?
Collaborator
Author
There was a problem hiding this comment.
updated as discussed
sasurobert
reviewed
Oct 24, 2024
|
|
||
| for _, event := range txWithResults.log.GetLogEvents() { | ||
| if core.WriteLogIdentifier == string(event.GetIdentifier()) && !hasRefund { | ||
| if !check.IfNilReflect(userTx) && tep.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, epoch) { |
Contributor
There was a problem hiding this comment.
do you need check.IfNilReflect ? don't you have simple check.IfNil ?
| } | ||
|
|
||
| if isSCRForSenderWithRefund(scr, txHashHex, txWithResults.GetTxHandler()) || isRefundForRelayed(scr, txWithResults.GetTxHandler()) { | ||
| if !check.IfNilReflect(userTx) && tep.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, epoch) { |
Contributor
There was a problem hiding this comment.
do you need check.IfNilReflect ? don't you have simple check.IfNil ?
sasurobert
reviewed
Oct 24, 2024
| gasUsed, fee := gfp.feeComputer.ComputeGasUsedAndFeeBasedOnRefundValue(tx, big.NewInt(0)) | ||
| tx.GasUsed = gasUsed | ||
| tx.Fee = fee.String() | ||
| if !check.IfNilReflect(userTx) && gfp.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, tx.Epoch) { |
| userTx *transaction.ApiTransactionResult, | ||
| refund *big.Int, | ||
| ) { | ||
| if !check.IfNilReflect(userTx) && gfp.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, tx.Epoch) { |
sasurobert
approved these changes
Oct 24, 2024
miiu96
approved these changes
Oct 24, 2024
AdoAdoAdo
reviewed
Oct 24, 2024
| tx.GasUsed = gasUsed | ||
| tx.Fee = fee.String() | ||
| if !check.IfNilReflect(userTx) && gfp.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, tx.Epoch) { | ||
| gasUsed, fee := gfp.feeComputer.ComputeGasUsedAndFeeBasedOnRefundValue(userTx, big.NewInt(0)) |
Contributor
There was a problem hiding this comment.
the code block L162-L174 is very similar to L189-L206, can you extract it in a function and call it in both places?
|
|
||
| for _, event := range txWithResults.log.GetLogEvents() { | ||
| if core.WriteLogIdentifier == string(event.GetIdentifier()) && !hasRefund { | ||
| if !check.IfNil(userTx) && tep.enableEpochsHandler.IsFlagEnabledInEpoch(common.FixRelayedBaseCostFlag, epoch) { |
Contributor
There was a problem hiding this comment.
same here the two code blocks inside prepareTxWithResultsBasedOnLogs and in prepareScrsNoTx are similar
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.
Reasoning behind the pull request
Proposed changes
Testing procedure
Pre-requisites
Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:
featbranch created?featbranch merging, do all satellite projects have a proper tag insidego.mod?