forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix: do not lose the AA tx application error; fix lost 'nonce' value

Browse source
This commit is contained in:
Alex Forshtat 2024-07-18 23:09:15 +02:00
parent 736e0e2638
commit 1712985683
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/types/tx_rip7560.go
View file

@ -106,7 +106,7 @@ func (tx *Rip7560AccountAbstractionTx) gasFeeCap() *big.Int { return tx.GasFe
func (tx *Rip7560AccountAbstractionTx) gasTipCap() *big.Int { return tx.GasTipCap } func (tx *Rip7560AccountAbstractionTx) gasTipCap() *big.Int { return tx.GasTipCap }
func (tx *Rip7560AccountAbstractionTx) gasPrice() *big.Int { return tx.GasFeeCap } func (tx *Rip7560AccountAbstractionTx) gasPrice() *big.Int { return tx.GasFeeCap }
func (tx *Rip7560AccountAbstractionTx) value() *big.Int { return tx.Value } func (tx *Rip7560AccountAbstractionTx) value() *big.Int { return tx.Value }
func (tx *Rip7560AccountAbstractionTx) nonce() uint64 { return 0 } func (tx *Rip7560AccountAbstractionTx) nonce() uint64 { return tx.Nonce }
func (tx *Rip7560AccountAbstractionTx) to() *common.Address { return tx.To } func (tx *Rip7560AccountAbstractionTx) to() *common.Address { return tx.To }
func (tx *Rip7560AccountAbstractionTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int { func (tx *Rip7560AccountAbstractionTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int {

1
internal/ethapi/transaction_args.go
View file

@ -493,6 +493,7 @@ func (args *TransactionArgs) ToTransaction() *types.Transaction {
To: &common.Address{}, To: &common.Address{},
ChainID: (*big.Int)(args.ChainID), ChainID: (*big.Int)(args.ChainID),
Gas: uint64(*args.Gas), Gas: uint64(*args.Gas),
Nonce: uint64(*args.Nonce),
GasFeeCap: (*big.Int)(args.MaxFeePerGas), GasFeeCap: (*big.Int)(args.MaxFeePerGas),
GasTipCap: (*big.Int)(args.MaxPriorityFeePerGas), GasTipCap: (*big.Int)(args.MaxPriorityFeePerGas),
Value: (*big.Int)(args.Value), Value: (*big.Int)(args.Value),

1
miner/worker.go
View file

@ -431,6 +431,7 @@ func (miner *Miner) fillTransactions(interrupt *atomic.Int32, env *environment)
pendingBundle, err := miner.txpool.PendingRip7560Bundle() pendingBundle, err := miner.txpool.PendingRip7560Bundle()
if pendingBundle != nil { if pendingBundle != nil {
if err = miner.commitRip7560TransactionsBundle(env, pendingBundle, interrupt); err != nil { if err = miner.commitRip7560TransactionsBundle(env, pendingBundle, interrupt); err != nil {
log.Error(err.Error())
return err return err
} }
} }