Skip to content

fix: propagate ledger error wrapping correctly #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damiannolan merged 3 commits into from
Mar 3, 2025
Merged

fix: propagate ledger error wrapping correctly #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2d24b6
fix: propagate ledger error wrapping correctly
damiannolan Mar 3, 2025
8d0cff4
chore: add changelog
damiannolan Mar 3, 2025
65d8eee
Merge branch 'release/v0.50.x-celestia' into damian/ledger-errors
damiannolan Mar 3, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (testing) [#5](https://github.com/01builders/cosmos-sdk/pull/5) Add `MakeTestEncodingConfigWithOpts` to pass `testutil.CodecOptions` when creating `TestEncodingConfig`.
* (x/bank) [#6](https://github.com/01builders/cosmos-sdk/pull/6) Change denom index bank migration to noOp.
* (x/auth) [#7](https://github.com/01builders/cosmos-sdk/pull/7) Support legacy global AccountNumber.
* (crypto/keyring) [#8](https://github.com/01builders/cosmos-sdk/pull/8) Fix error wrapping in pkg crypto/keyring. Removed `cockroachdb/errors` in favour of `errorsmod.Wrap`.

## [v0.50.11](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.11) - 2024-12-16

Expand Down
8 changes: 4 additions & 4 deletions crypto/keyring/keyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package keyring
import (
"bufio"
"encoding/hex"
"errors"
"fmt"
"io"
"os"
Expand All @@ -11,7 +12,6 @@ import (
"strings"

"github.com/99designs/keyring"
"github.com/cockroachdb/errors"
"github.com/cosmos/go-bip39"
"golang.org/x/crypto/bcrypt"

Expand Down Expand Up @@ -418,7 +418,7 @@ func (ks keystore) SaveLedgerKey(uid string, algo SignatureAlgo, hrp string, coi

priv, _, err := ledger.NewPrivKeySecp256k1(*hdPath, hrp)
if err != nil {
return nil, errors.CombineErrors(ErrLedgerGenerateKey, err)
return nil, errorsmod.Wrap(err, ErrLedgerGenerateKey.Error())
}

return ks.writeLedgerKey(uid, priv.PubKey(), hdPath)
Expand Down Expand Up @@ -813,7 +813,7 @@ func (ks keystore) writeRecord(k *Record) error {

serializedRecord, err := ks.cdc.Marshal(k)
if err != nil {
return errors.CombineErrors(ErrUnableToSerialize, err)
return errorsmod.Wrap(err, ErrUnableToSerialize.Error())
}

item := keyring.Item{
Expand Down Expand Up @@ -964,7 +964,7 @@ func (ks keystore) migrate(key string) (*Record, error) {

serializedRecord, err := ks.cdc.Marshal(k)
if err != nil {
return nil, errors.CombineErrors(ErrUnableToSerialize, err)
return nil, errorsmod.Wrap(err, ErrUnableToSerialize.Error())
}

item = keyring.Item{
Expand Down
Loading