Skip to content

G
Geth-Modification
Unverified Commit 85d5f2c6 authored by Péter Szilágyi's avatar Péter Szilágyi Committed by GitHub
Browse files
Options

Merge pull request #16285 from karalabe/fix-resend-optional-param 

internal/ethapi: make resent gas params optional
parents 704840a8 28ef23f4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
internal/ethapi/api.go
View file @ 85d5f2c6
...@@ -1337,10 +1337,10 @@ func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, sendArgs SendTxAr ...@@ -1337,10 +1337,10 @@ func (s *PublicTransactionPoolAPI) Resend(ctx context.Context, sendArgs SendTxAr
if pFrom, err := types.Sender(signer, p); err == nil && pFrom == sendArgs.From && signer.Hash(p) == wantSigHash { if pFrom, err := types.Sender(signer, p); err == nil && pFrom == sendArgs.From && signer.Hash(p) == wantSigHash {
// Match. Re-sign and send the transaction. // Match. Re-sign and send the transaction.
if gasPrice != nil { if gasPrice != nil && (*big.Int)(gasPrice).Sign() != 0 {
sendArgs.GasPrice = gasPrice sendArgs.GasPrice = gasPrice
} }
if gasLimit != nil { if gasLimit != nil && *gasLimit != 0 {
sendArgs.Gas = gasLimit sendArgs.Gas = gasLimit
} }
signedTx, err := s.sign(sendArgs.From, sendArgs.toTransaction()) signedTx, err := s.sign(sendArgs.From, sendArgs.toTransaction())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment