Skip to content

Commit

Permalink
accounts/usbwallet: fix staticcheck warnings (ethereum#20372)
Browse files Browse the repository at this point in the history
  • Loading branch information
gzliudan committed Jan 17, 2025
1 parent eec6db3 commit 1290c0a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions accounts/usbwallet/ledger.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ func (w *ledgerDriver) SignTx(path accounts.DerivationPath, tx *types.Transactio
return common.Address{}, nil, accounts.ErrWalletClosed
}
// Ensure the wallet is capable of signing the given transaction
if chainID != nil && w.version[0] <= 1 && w.version[1] <= 0 && w.version[2] <= 2 {
return common.Address{}, nil, fmt.Errorf("ledger v%d.%d.%d doesn't support signing this transaction, please update to v1.0.3 at least", w.version[0], w.version[1], w.version[2])
if chainID != nil && w.version[0] <= 1 && w.version[2] <= 2 {
//lint:ignore ST1005 brand name displayed on the console
return common.Address{}, nil, fmt.Errorf("Ledger v%d.%d.%d doesn't support signing this transaction, please update to v1.0.3 at least", w.version[0], w.version[1], w.version[2])
}
// All infos gathered and metadata checks out, request signing
return w.ledgerSign(path, tx, chainID)
Expand Down Expand Up @@ -353,7 +354,7 @@ func (w *ledgerDriver) ledgerSign(derivationPath []uint32, tx *types.Transaction
signer = new(types.HomesteadSigner)
} else {
signer = types.NewEIP155Signer(chainID)
signature[crypto.RecoveryIDOffset] -= byte(chainID.Uint64()*2+35)
signature[crypto.RecoveryIDOffset] -= byte(chainID.Uint64()*2 + 35)
}
signed, err := tx.WithSignature(signer, signature)
if err != nil {
Expand Down

0 comments on commit 1290c0a

Please sign in to comment.