Skip to content

Commit fdac893

Browse files
authored
Merge pull request #227 from rootulp/rp/cherry-pick-remove-cosmos-keyring
refactor: remove cosmos/keyring
2 parents 2d2e260 + f027a17 commit fdac893

File tree

3 files changed

+41
-21
lines changed

3 files changed

+41
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
181181

182182
### Improvements
183183

184+
* [\#12576](https://github.com/cosmos/cosmos-sdk/pull/12576) Remove dependency on cosmos/keyring and upgrade to 99designs/keyring v1.2.1
184185
* [\#11693](https://github.com/cosmos/cosmos-sdk/pull/11693) Add validation for gentx cmd.
185186
* (x/auth/vesting) [\#11652](https://github.com/cosmos/cosmos-sdk/pull/11652) Add util functions for `Period(s)`
186187
* [\#11630](https://github.com/cosmos/cosmos-sdk/pull/11630) Add SafeSub method to sdk.Coin.

go.mod

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ go 1.17
33
module github.com/cosmos/cosmos-sdk
44

55
require (
6-
github.com/99designs/keyring v1.1.6
6+
github.com/99designs/keyring v1.2.1
77
github.com/armon/go-metrics v0.3.10
88
github.com/bgentry/speakeasy v0.1.0
99
github.com/btcsuite/btcd v0.22.0-beta
@@ -18,7 +18,6 @@ require (
1818
github.com/cosmos/go-bip39 v1.0.0
1919
github.com/cosmos/iavl v0.18.0
2020
github.com/cosmos/ledger-cosmos-go v0.11.1
21-
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
2221
github.com/gogo/gateway v1.1.0
2322
github.com/gogo/protobuf v1.3.3
2423
github.com/golang/mock v1.6.0
@@ -65,6 +64,7 @@ require (
6564
cloud.google.com/go/iam v0.3.0 // indirect
6665
cloud.google.com/go/storage v1.14.0 // indirect
6766
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
67+
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
6868
github.com/Workiva/go-datastructures v1.0.53 // indirect
6969
github.com/aws/aws-sdk-go v1.40.45 // indirect
7070
github.com/beorn7/perks v1.0.1 // indirect
@@ -78,13 +78,14 @@ require (
7878
github.com/cespare/xxhash/v2 v2.1.2 // indirect
7979
github.com/cosmos/ledger-go v0.9.2 // indirect
8080
github.com/creachadair/taskgroup v0.3.2 // indirect
81-
github.com/danieljoos/wincred v1.0.2 // indirect
81+
github.com/danieljoos/wincred v1.1.2 // indirect
8282
github.com/davecgh/go-spew v1.1.1 // indirect
83+
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8384
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
8485
github.com/dgraph-io/ristretto v0.1.0 // indirect
8586
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
8687
github.com/dustin/go-humanize v1.0.0 // indirect
87-
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
88+
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
8889
github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect
8990
github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect
9091
github.com/felixge/httpsnoop v1.0.1 // indirect
@@ -109,8 +110,8 @@ require (
109110
github.com/inconshreveable/mousetrap v1.0.0 // indirect
110111
github.com/jmespath/go-jmespath v0.4.0 // indirect
111112
github.com/jmhodges/levigo v1.0.0 // indirect
112-
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect
113113
github.com/klauspost/compress v1.13.6 // indirect
114+
github.com/kr/pretty v0.3.0 // indirect
114115
github.com/lib/pq v1.10.5 // indirect
115116
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
116117
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -120,13 +121,16 @@ require (
120121
github.com/mitchellh/mapstructure v1.4.3 // indirect
121122
github.com/mtibben/percent v0.2.1 // indirect
122123
github.com/oasisprotocol/curve25519-voi v0.0.0-20210609091139-0a56a4bca00b // indirect
124+
github.com/onsi/ginkgo v1.16.4 // indirect
125+
github.com/onsi/gomega v1.18.1 // indirect
123126
github.com/pelletier/go-toml v1.9.4 // indirect
124127
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
125128
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
126129
github.com/pmezard/go-difflib v1.0.0 // indirect
127130
github.com/prometheus/client_model v0.2.0 // indirect
128131
github.com/prometheus/procfs v0.7.3 // indirect
129132
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
133+
github.com/rogpeppe/go-internal v1.8.1 // indirect
130134
github.com/rs/cors v1.8.2 // indirect
131135
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
132136
github.com/spf13/afero v1.8.2 // indirect
@@ -155,7 +159,6 @@ require (
155159
)
156160

157161
replace (
158-
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
159162
github.com/cosmos/cosmos-sdk/db => ./db
160163

161164
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.

0 commit comments

Comments
 (0)