Skip to content
This repository has been archived by the owner on May 11, 2024. It is now read-only.

feat(sender): upgrade sender #603

Merged
merged 3 commits into from
Mar 5, 2024
Merged

feat(sender): upgrade sender #603

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f78621b
upgrade sender
mask-pp Mar 5, 2024
8250dd8
Merge branch 'main' into upgrade_sender_3
mask-pp Mar 5, 2024
e5196db
log more message
mask-pp Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions internal/sender/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,12 @@ func (s *Sender) SendTransaction(tx *types.Transaction) (string, error) {
}

if err := s.send(txToConfirm); err != nil && !strings.Contains(err.Error(), "replacement transaction") {
log.Error("Failed to send transaction", "id", txID, "hash", tx.Hash(), "err", err)
log.Error("Failed to send transaction",
"tx_id", txID,
"nonce", txToConfirm.CurrentTx.Nonce(),
"hash", tx.Hash(),
"err", err,
)
return "", err
}

Expand Down Expand Up @@ -254,20 +259,35 @@ func (s *Sender) send(tx *TxToConfirm) error {
if err != nil {
if strings.Contains(err.Error(), "nonce too low") {
s.AdjustNonce(originalTx)
log.Warn("Nonce is incorrect, retry sending the transaction with new nonce", "hash", rawTx.Hash(), "err", err)
log.Warn("Nonce is incorrect, retry sending the transaction with new nonce",
"tx_id", tx.ID,
"nonce", tx.CurrentTx.Nonce(),
"hash", rawTx.Hash(),
"err", err,
)
continue
}
if strings.Contains(err.Error(), "replacement transaction underpriced") {
s.adjustGas(originalTx)
log.Warn("Replacement transaction underpriced", "hash", rawTx.Hash(), "err", err)
log.Warn("Replacement transaction underpriced",
"tx_id", tx.ID,
"nonce", tx.CurrentTx.Nonce(),
"hash", rawTx.Hash(),
"err", err,
)
continue
}
log.Error("Failed to send transaction", "hash", rawTx.Hash(), "err", err)
log.Error("Failed to send transaction",
"tx_id", tx.ID,
"nonce", tx.CurrentTx.Nonce(),
"hash", rawTx.Hash(),
"err", err,
)
return err
}
s.Opts.Nonce = new(big.Int).Add(s.Opts.Nonce, common.Big1)
break
}
s.Opts.Nonce = new(big.Int).Add(s.Opts.Nonce, common.Big1)
return nil
}

Expand Down Expand Up @@ -323,7 +343,9 @@ func (s *Sender) resendUnconfirmedTxs() {
if err := s.send(unconfirmedTx); err != nil {
log.Warn(
"Failed to resend the transaction",
"id", id,
"tx_id", id,
"nonce", unconfirmedTx.CurrentTx.Nonce(),
"hash", unconfirmedTx.CurrentTx.Hash(),
"retrys", unconfirmedTx.Retrys,
"err", err,
)
Expand All @@ -341,7 +363,12 @@ func (s *Sender) checkPendingTransactionsConfirmation() {
// Ignore the transaction if it is pending.
tx, isPending, err := s.client.TransactionByHash(s.ctx, pendingTx.CurrentTx.Hash())
if err != nil {
log.Warn("Failed to fetch transaction", "hash", pendingTx.CurrentTx.Hash(), "err", err)
log.Warn("Failed to fetch transaction",
"tx_id", pendingTx.ID,
"nonce", pendingTx.CurrentTx.Nonce(),
"hash", pendingTx.CurrentTx.Hash(),
"err", err,
)
continue
}
if isPending {
Expand Down
Loading