forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reflect PR comments

Browse source
This commit is contained in:
rrhlrmrr 2025-04-22 23:43:18 +09:00
parent d1a6f5d81e
commit 1a1c1a4718
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/types/transaction.go
View file

@ -356,11 +356,11 @@ func (tx *Transaction) GasTipCapIntCmp(other *big.Int) int {
// the actual negative value, _and_ ErrGasFeeCapTooLow // the actual negative value, _and_ ErrGasFeeCapTooLow
func (tx *Transaction) EffectiveGasTip(baseFee *big.Int) (*big.Int, error) { func (tx *Transaction) EffectiveGasTip(baseFee *big.Int) (*big.Int, error) {
dst := new(big.Int) dst := new(big.Int)
err := tx.EffectiveGasTipInto(dst, baseFee) err := tx.effectiveGasTipInto(dst, baseFee)
return dst, err return dst, err
} }
func (tx *Transaction) EffectiveGasTipInto(dst *big.Int, baseFee *big.Int) error { func (tx *Transaction) effectiveGasTipInto(dst *big.Int, baseFee *big.Int) error {
if baseFee == nil { if baseFee == nil {
dst.Set(tx.inner.gasTipCap()) dst.Set(tx.inner.gasTipCap())
return nil return nil
@ -380,14 +380,6 @@ func (tx *Transaction) EffectiveGasTipInto(dst *big.Int, baseFee *big.Int) error
return err return err
} }
// EffectiveGasTipValue is identical to EffectiveGasTip, but does not return an
// error in case the effective gasTipCap is negative
func (tx *Transaction) EffectiveGasTipValue(baseFee *big.Int) *big.Int {
dst := new(big.Int)
tx.EffectiveGasTipInto(dst, baseFee)
return dst
}
// EffectiveGasTipCmp compares the effective gasTipCap of two transactions assuming the given base fee. // EffectiveGasTipCmp compares the effective gasTipCap of two transactions assuming the given base fee.
func (tx *Transaction) EffectiveGasTipCmp(other *Transaction, baseFee *big.Int) int { func (tx *Transaction) EffectiveGasTipCmp(other *Transaction, baseFee *big.Int) int {
if baseFee == nil { if baseFee == nil {
@ -395,8 +387,8 @@ func (tx *Transaction) EffectiveGasTipCmp(other *Transaction, baseFee *big.Int)
} }
txTip := new(big.Int) txTip := new(big.Int)
otherTip := new(big.Int) otherTip := new(big.Int)
tx.EffectiveGasTipInto(txTip, baseFee) tx.effectiveGasTipInto(txTip, baseFee)
other.EffectiveGasTipInto(otherTip, baseFee) other.effectiveGasTipInto(otherTip, baseFee)
return txTip.Cmp(otherTip) return txTip.Cmp(otherTip)
} }
@ -406,7 +398,7 @@ func (tx *Transaction) EffectiveGasTipIntCmp(other *big.Int, baseFee *big.Int) i
return tx.GasTipCapIntCmp(other) return tx.GasTipCapIntCmp(other)
} }
txTip := new(big.Int) txTip := new(big.Int)
tx.EffectiveGasTipInto(txTip, baseFee) tx.effectiveGasTipInto(txTip, baseFee)
return txTip.Cmp(other) return txTip.Cmp(other)
} }

4
core/types/transaction_test.go
View file

@ -625,7 +625,7 @@ func BenchmarkEffectiveGasTip(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
dst := new(big.Int) dst := new(big.Int)
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
err := tx.EffectiveGasTipInto(dst, baseFee) err := tx.effectiveGasTipInto(dst, baseFee)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }
@ -675,7 +675,7 @@ func TestEffectiveGasTipInto(t *testing.T) {
// Get result from new method // Get result from new method
dst := new(big.Int) dst := new(big.Int)
newErr := tx.EffectiveGasTipInto(dst, baseFee) newErr := tx.effectiveGasTipInto(dst, baseFee)
// Compare results // Compare results
if (origErr != nil) != (newErr != nil) { if (origErr != nil) != (newErr != nil) {

3
eth/tracers/js/goja.go
View file

@ -260,7 +260,8 @@ func (t *jsTracer) OnTxStart(env *tracing.VMContext, tx *types.Transaction, from
t.activePrecompiles = vm.ActivePrecompiles(rules) t.activePrecompiles = vm.ActivePrecompiles(rules)
t.ctx["block"] = t.vm.ToValue(t.env.BlockNumber.Uint64()) t.ctx["block"] = t.vm.ToValue(t.env.BlockNumber.Uint64())
t.ctx["gas"] = t.vm.ToValue(tx.Gas()) t.ctx["gas"] = t.vm.ToValue(tx.Gas())
gasPriceBig, err := t.toBig(t.vm, tx.EffectiveGasTipValue(env.BaseFee).String()) gasTip, _ := tx.EffectiveGasTip(env.BaseFee)
gasPriceBig, err := t.toBig(t.vm, gasTip.String())
if err != nil { if err != nil {
t.err = err t.err = err
return return