added fee in elastic search transactions #2658
Conversation
miiu96
changed the title
process/economics/economicsData.go
Outdated
|
|
||
| func (ed *economicsData) computeGasRefund(refundValue *big.Int, gasPrice uint64) uint64 { | ||
| gasPriceBig := big.NewInt(0).SetUint64(gasPrice) | ||
|
|
process/economics/economicsData.go
Outdated
| gasPriceBig := big.NewInt(0).SetUint64(gasPrice) | ||
|
|
||
| gasRefund := big.NewInt(0).Div(refundValue, gasPriceBig).Uint64() | ||
|
|
…or-cases small-improvement-of-return-message
core/indexer/common.go
Outdated
| return true | ||
| } | ||
| } | ||
|
|
||
| return false | ||
| } | ||
|
|
||
| func isRelayedTx(tx *Transaction) bool { | ||
| if strings.HasPrefix(string(tx.Data), "relayedTx") && len(tx.SmartContractResults) > 0 { |
There was a problem hiding this comment.
You can use one line here: return strings.HasPrefix(string(tx.Data), "relayedTx") && len(tx.SmartContractResults) > 0
| @@ -159,8 +159,8 @@ func checkDataIndexerParams(arguments *ArgsIndexerFactory) error { | |||
| if check.IfNil(arguments.EpochStartNotifier) { | |||
| return core.ErrNilEpochStartNotifier | |||
| } | |||
| if arguments.FeeConfig == nil { | |||
| return core.ErrNilFeeConfig | |||
| if arguments.TransactionFeeCalculator == nil { | |||
core/indexer/processTransactions.go
Outdated
| if isRelayedTx(tx) { | ||
| tx.GasUsed = tx.GasLimit | ||
| fee := tdp.txFeeCalculator.ComputeTxFeeBasedOnGasUsed(tx, tx.GasUsed) | ||
| transactions[hash].Fee = fee.String() |
There was a problem hiding this comment.
tx instead transactions[hash]
core/indexer/processTransactions.go
Outdated
| continue | ||
| } | ||
|
|
||
| transactions[hash].Status = transaction.TxStatusFail.String() | ||
| tx.Status = transaction.TxStatusFail.String() |
There was a problem hiding this comment.
I think you can remove lines 113-118 and just add this line inside -> if !isRelayedTx(tx), and this way you remove the duplicated code here
process/economics/economicsData.go
Outdated
| } | ||
|
|
||
| gasRefund := ed.computeGasRefund(refundValue, tx.GetGasPrice()) | ||
| gasUsed := tx.GetGasLimit() - gasRefund |
There was a problem hiding this comment.
Use safeSub with log
|
|
||
| gasRefund := big.NewInt(0).Div(refundValue, gasPriceBig).Uint64() | ||
|
|
||
| gasRefund = uint64(ed.GasPriceModifier() * float64(gasRefund)) |
There was a problem hiding this comment.
So we will assume that any refunded value would have been used with gas price modifier applied @sasurobert
There was a problem hiding this comment.
ed.GasPriceModifier return 1.0 when it is disabled
There was a problem hiding this comment.
Yes I know, but I have referred here to all the situations after the flag activation.
|
|
||
| gasRefund := big.NewInt(0).Div(refundValue, gasPriceBig).Uint64() | ||
|
|
||
| gasRefund = uint64(ed.GasPriceModifier() * float64(gasRefund)) |
There was a problem hiding this comment.
Yes I know, but I have referred here to all the situations after the flag activation.
Added fee in transaction that is indexed in elasticsearch database.
Added
gasPriceModiferin the api route/network/config