Fix backwards compatibility for tx fee #2257
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
Contributor
SebastianMarian
commented
Aug 30, 2020
SebastianMarian
commented
- Fixed backwards compatibility for calculation of tx fee in "checkTxValues" method from baseTxProcessor and "Fee" method from InterceptedTransaction
…Values" method from baseTxProcessor and "Fee" method from InterceptedTransaction
SebastianMarian
changed the title
…tartNotifier object
…tx-fee' into Fix-backwards-compatibility-for-tx-fee
SebastianMarian
added
type:feature
sasurobert
requested changes
Aug 31, 2020
cmd/node/main.go
Outdated
| @@ -833,7 +833,11 @@ func startNode(ctx *cli.Context, log logger.Logger, version string) error { | |||
| time.Sleep(secondsToWaitForP2PBootstrap * time.Second) | |||
|
|
|||
| log.Trace("creating economics data components") | |||
| economicsData, err := economics.NewEconomicsData(economicsConfig) | |||
| economicsData, err := economics.NewEconomicsData( | |||
| economicsConfig, | |||
There was a problem hiding this comment.
add arguments structure instead of list of arguments
process/economics/economicsData.go
Outdated
|
|
||
| return gasPrice.Mul(gasPrice, gasLimit) | ||
| // EstimateMoveBalanceFee estimates the provided transaction's fee | ||
| func (ed *EconomicsData) EstimateMoveBalanceFee(tx process.TransactionWithFeeHandler) *big.Int { |
There was a problem hiding this comment.
Wrong function name - we will get into the same problem later on.
process/transaction/baseProcess.go
Outdated
| @@ -137,7 +137,7 @@ func (txProc *baseTxProcessor) checkTxValues( | |||
| return process.ErrWrongTypeAssertion | |||
| } | |||
|
|
|||
| txFee := core.SafeMul(tx.GasLimit, tx.GasPrice) | |||
| txFee := txProc.economicsFee.EstimateMoveBalanceFee(tx) | |||
…tx-fee' into Fix-backwards-compatibility-for-tx-fee # Conflicts: # cmd/node/main.go
sasurobert
approved these changes
Aug 31, 2020
AdoAdoAdo
approved these changes
Sep 1, 2020
LucianMincu
approved these changes
Sep 2, 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.