diff --git a/core/types/tx_rip7560.go b/core/types/tx_rip7560.go index 76443ac078..59e2792570 100644 --- a/core/types/tx_rip7560.go +++ b/core/types/tx_rip7560.go @@ -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) gasPrice() *big.Int { return tx.GasFeeCap } 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) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int { diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index 06b5ae6089..f8b891e656 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -493,6 +493,7 @@ func (args *TransactionArgs) ToTransaction() *types.Transaction { To: &common.Address{}, ChainID: (*big.Int)(args.ChainID), Gas: uint64(*args.Gas), + Nonce: uint64(*args.Nonce), GasFeeCap: (*big.Int)(args.MaxFeePerGas), GasTipCap: (*big.Int)(args.MaxPriorityFeePerGas), Value: (*big.Int)(args.Value), diff --git a/miner/worker.go b/miner/worker.go index c52a9c7eb0..2cab82899e 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -431,6 +431,7 @@ func (miner *Miner) fillTransactions(interrupt *atomic.Int32, env *environment) pendingBundle, err := miner.txpool.PendingRip7560Bundle() if pendingBundle != nil { if err = miner.commitRip7560TransactionsBundle(env, pendingBundle, interrupt); err != nil { + log.Error(err.Error()) return err } }