forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-20 11:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/types: improve effectiveGasPrice

Browse source
This commit is contained in:
cuiweixie 2026-01-24 10:19:50 +08:00
parent 9a8e14e77e
commit ba80c16384
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/types/tx_blob.go
View file

@ -295,11 +295,12 @@ func (tx *BlobTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int {
if baseFee == nil { if baseFee == nil {
return dst.Set(tx.GasFeeCap.ToBig()) return dst.Set(tx.GasFeeCap.ToBig())
} }
tip := dst.Sub(tx.GasFeeCap.ToBig(), baseFee) effectiveGasPrice := dst.Add(tx.GasTipCap.ToBig(), baseFee)
if tip.Cmp(tx.GasTipCap.ToBig()) > 0 { gasFeeCap := tx.GasFeeCap.ToBig()
tip.Set(tx.GasTipCap.ToBig()) if effectiveGasPrice.Cmp(gasFeeCap) > 0 {
effectiveGasPrice.Set(gasFeeCap)
} }
return tip.Add(tip, baseFee) return effectiveGasPrice
} }
func (tx *BlobTx) rawSignatureValues() (v, r, s *big.Int) { func (tx *BlobTx) rawSignatureValues() (v, r, s *big.Int) {

8
core/types/tx_dynamic_fee.go
View file

@ -101,11 +101,11 @@ func (tx *DynamicFeeTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.I
if baseFee == nil { if baseFee == nil {
return dst.Set(tx.GasFeeCap) return dst.Set(tx.GasFeeCap)
} }
tip := dst.Sub(tx.GasFeeCap, baseFee) effectiveGasPrice := dst.Add(tx.GasTipCap, baseFee)
if tip.Cmp(tx.GasTipCap) > 0 { if effectiveGasPrice.Cmp(tx.GasFeeCap) > 0 {
tip.Set(tx.GasTipCap) effectiveGasPrice.Set(tx.GasFeeCap)
} }
return tip.Add(tip, baseFee) return effectiveGasPrice
} }
func (tx *DynamicFeeTx) rawSignatureValues() (v, r, s *big.Int) { func (tx *DynamicFeeTx) rawSignatureValues() (v, r, s *big.Int) {

9
core/types/tx_setcode.go
View file

@ -202,11 +202,12 @@ func (tx *SetCodeTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int
if baseFee == nil { if baseFee == nil {
return dst.Set(tx.GasFeeCap.ToBig()) return dst.Set(tx.GasFeeCap.ToBig())
} }
tip := dst.Sub(tx.GasFeeCap.ToBig(), baseFee) effectiveGasPrice := dst.Add(tx.GasTipCap.ToBig(), baseFee)
if tip.Cmp(tx.GasTipCap.ToBig()) > 0 { gasTipCap := tx.GasFeeCap.ToBig()
tip.Set(tx.GasTipCap.ToBig()) if effectiveGasPrice.Cmp(gasTipCap) > 0 {
effectiveGasPrice.Set(gasTipCap)
} }
return tip.Add(tip, baseFee) return effectiveGasPrice
} }
func (tx *SetCodeTx) rawSignatureValues() (v, r, s *big.Int) { func (tx *SetCodeTx) rawSignatureValues() (v, r, s *big.Int) {