Skip to content

Commit 4f48b47

Browse files
committed
Problem: cometbft out of date
1 parent 9288301 commit 4f48b47

File tree

4 files changed

+278
-387
lines changed

4 files changed

+278
-387
lines changed

crypto/keys/secp256k1/secp256k1_nocgo.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import (
1414
// The returned signature will be of the form R || S (in lower-S form).
1515
func (privKey *PrivKey) Sign(msg []byte) ([]byte, error) {
1616
priv, _ := secp256k1.PrivKeyFromBytes(privKey.Key)
17-
sig, err := ecdsa.SignCompact(priv, crypto.Sha256(msg), false)
18-
if err != nil {
19-
return nil, err
20-
}
17+
sig := ecdsa.SignCompact(priv, crypto.Sha256(msg), false)
2118
// remove the first byte which is compactSigRecoveryCode
2219
return sig[1:], nil
2320
}

crypto/keys/secp256k1/secp256k1_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ func TestSignAndValidateSecp256k1(t *testing.T) {
7878
ok := ecdsa.Verify(btcPubKey.ToECDSA(), msgHash, r, s)
7979
require.True(t, ok)
8080

81-
sig2, err := btcecdsa.SignCompact(btcPrivKey, msgHash, false)
81+
sig2 := btcecdsa.SignCompact(btcPrivKey, msgHash, false)
8282
// Chop off compactSigRecoveryCode.
8383
sig2 = sig2[1:]
84-
require.NoError(t, err)
8584
pubKey.VerifySignature(msg, sig2)
8685

8786
// ----

go.mod

+78-67
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
go 1.19
1+
go 1.22.0
2+
3+
toolchain go1.23.1
24

35
module github.com/cosmos/cosmos-sdk
46

@@ -8,7 +10,7 @@ require (
810
github.com/99designs/keyring v1.2.1
911
github.com/armon/go-metrics v0.4.1
1012
github.com/bgentry/speakeasy v0.1.0
11-
github.com/btcsuite/btcd/btcec/v2 v2.3.2
13+
github.com/btcsuite/btcd/btcec/v2 v2.3.4
1214
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
1315
github.com/cockroachdb/apd/v2 v2.0.2
1416
github.com/coinbase/rosetta-sdk-go v0.7.9
@@ -22,8 +24,8 @@ require (
2224
github.com/gogo/gateway v1.1.0
2325
github.com/gogo/protobuf v1.3.2
2426
github.com/golang/mock v1.6.0
25-
github.com/golang/protobuf v1.5.3
26-
github.com/google/uuid v1.3.0
27+
github.com/golang/protobuf v1.5.4
28+
github.com/google/uuid v1.6.0
2729
github.com/gorilla/handlers v1.5.1
2830
github.com/gorilla/mux v1.8.0
2931
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -33,76 +35,77 @@ require (
3335
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3
3436
github.com/improbable-eng/grpc-web v0.15.0
3537
github.com/jhump/protoreflect v1.15.1
36-
github.com/magiconair/properties v1.8.6
38+
github.com/magiconair/properties v1.8.7
3739
github.com/manifoldco/promptui v0.9.0
3840
github.com/mattn/go-isatty v0.0.18
3941
github.com/pkg/errors v0.9.1
40-
github.com/prometheus/client_golang v1.14.0
41-
github.com/prometheus/common v0.42.0
42+
github.com/prometheus/client_golang v1.20.3
43+
github.com/prometheus/common v0.59.1
4244
github.com/rakyll/statik v0.1.7
4345
github.com/regen-network/cosmos-proto v0.3.1
4446
github.com/rs/zerolog v1.29.1
45-
github.com/spf13/cast v1.5.0
46-
github.com/spf13/cobra v1.6.1
47+
github.com/spf13/cast v1.7.0
48+
github.com/spf13/cobra v1.8.1
4749
github.com/spf13/pflag v1.0.5
48-
github.com/spf13/viper v1.13.0
49-
github.com/stretchr/testify v1.8.2
50+
github.com/spf13/viper v1.19.0
51+
github.com/stretchr/testify v1.9.0
5052
github.com/tendermint/go-amino v0.16.0
5153
github.com/tendermint/tendermint v0.34.29
5254
github.com/tendermint/tm-db v0.6.7
5355
github.com/tidwall/btree v1.5.0
54-
golang.org/x/crypto v0.7.0
55-
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0
56-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
57-
google.golang.org/grpc v1.54.0
58-
google.golang.org/protobuf v1.30.0
56+
golang.org/x/crypto v0.27.0
57+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
58+
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117
59+
google.golang.org/grpc v1.66.1
60+
google.golang.org/protobuf v1.34.2
5961
pgregory.net/rapid v0.4.7
6062
sigs.k8s.io/yaml v1.3.0
6163
)
6264

6365
require (
64-
cloud.google.com/go v0.110.0 // indirect
65-
cloud.google.com/go/compute v1.18.0 // indirect
66-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
67-
cloud.google.com/go/iam v0.12.0 // indirect
68-
cloud.google.com/go/storage v1.28.1 // indirect
66+
cloud.google.com/go v0.112.1 // indirect
67+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
68+
cloud.google.com/go/iam v1.1.6 // indirect
69+
cloud.google.com/go/storage v1.38.0 // indirect
6970
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
7071
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
71-
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
72-
github.com/Workiva/go-datastructures v1.0.53 // indirect
72+
github.com/ChainSafe/go-schnorrkel v1.1.0 // indirect
73+
github.com/Workiva/go-datastructures v1.1.5 // indirect
7374
github.com/aws/aws-sdk-go v1.40.45 // indirect
7475
github.com/beorn7/perks v1.0.1 // indirect
7576
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
7677
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
7778
github.com/cespare/xxhash v1.1.0 // indirect
78-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
79-
github.com/cometbft/cometbft-db v0.7.0 // indirect
79+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
80+
github.com/cometbft/cometbft-db v0.9.5 // indirect
8081
github.com/cosmos/gorocksdb v1.2.0 // indirect
8182
github.com/creachadair/taskgroup v0.3.2 // indirect
8283
github.com/danieljoos/wincred v1.1.2 // indirect
83-
github.com/davecgh/go-spew v1.1.1 // indirect
84+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8485
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
8586
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8687
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
87-
github.com/dgraph-io/ristretto v0.1.0 // indirect
88+
github.com/dgraph-io/ristretto v0.1.1 // indirect
8889
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
89-
github.com/dustin/go-humanize v1.0.0 // indirect
90+
github.com/dustin/go-humanize v1.0.1 // indirect
9091
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
91-
github.com/felixge/httpsnoop v1.0.1 // indirect
92-
github.com/fsnotify/fsnotify v1.6.0 // indirect
93-
github.com/go-kit/kit v0.12.0 // indirect
92+
github.com/felixge/httpsnoop v1.0.4 // indirect
93+
github.com/fsnotify/fsnotify v1.7.0 // indirect
94+
github.com/go-kit/kit v0.13.0 // indirect
9495
github.com/go-kit/log v0.2.1 // indirect
95-
github.com/go-logfmt/logfmt v0.5.1 // indirect
96+
github.com/go-logfmt/logfmt v0.6.0 // indirect
97+
github.com/go-logr/logr v1.4.1 // indirect
98+
github.com/go-logr/stdr v1.2.2 // indirect
9699
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
97-
github.com/golang/glog v1.0.0 // indirect
100+
github.com/golang/glog v1.2.2 // indirect
98101
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
99102
github.com/golang/snappy v0.0.4 // indirect
100-
github.com/google/btree v1.1.2 // indirect
101-
github.com/google/go-cmp v0.5.9 // indirect
103+
github.com/google/btree v1.1.3 // indirect
102104
github.com/google/orderedcode v0.0.1 // indirect
103-
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
104-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
105-
github.com/gorilla/websocket v1.5.0 // indirect
105+
github.com/google/s2a-go v0.1.7 // indirect
106+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
107+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
108+
github.com/gorilla/websocket v1.5.3 // indirect
106109
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
107110
github.com/gtank/merlin v0.1.1 // indirect
108111
github.com/gtank/ristretto255 v0.1.2 // indirect
@@ -111,49 +114,57 @@ require (
111114
github.com/hashicorp/go-safetemp v1.0.0 // indirect
112115
github.com/hashicorp/go-version v1.6.0 // indirect
113116
github.com/hashicorp/hcl v1.0.0 // indirect
114-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
117+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
115118
github.com/jmespath/go-jmespath v0.4.0 // indirect
116119
github.com/jmhodges/levigo v1.0.0 // indirect
117-
github.com/klauspost/compress v1.16.0 // indirect
118-
github.com/lib/pq v1.10.7 // indirect
120+
github.com/klauspost/compress v1.17.9 // indirect
121+
github.com/lib/pq v1.10.9 // indirect
119122
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
123+
github.com/linxGnu/grocksdb v1.9.3 // indirect
120124
github.com/mattn/go-colorable v0.1.13 // indirect
121-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
122-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
123-
github.com/minio/highwayhash v1.0.2 // indirect
125+
github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect
126+
github.com/minio/highwayhash v1.0.3 // indirect
124127
github.com/mitchellh/go-homedir v1.1.0 // indirect
125128
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
126129
github.com/mitchellh/mapstructure v1.5.0 // indirect
127130
github.com/mtibben/percent v0.2.1 // indirect
131+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
128132
github.com/onsi/gomega v1.20.0 // indirect
129-
github.com/pelletier/go-toml v1.9.5 // indirect
130-
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
131-
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
132-
github.com/pmezard/go-difflib v1.0.0 // indirect
133-
github.com/prometheus/client_model v0.3.0 // indirect
134-
github.com/prometheus/procfs v0.9.0 // indirect
133+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
134+
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
135+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
136+
github.com/prometheus/client_model v0.6.1 // indirect
137+
github.com/prometheus/procfs v0.15.1 // indirect
135138
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
136-
github.com/rogpeppe/go-internal v1.9.0 // indirect
137-
github.com/rs/cors v1.8.2 // indirect
138-
github.com/sasha-s/go-deadlock v0.3.1 // indirect
139-
github.com/spf13/afero v1.8.2 // indirect
140-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
141-
github.com/subosito/gotenv v1.4.1 // indirect
139+
github.com/rs/cors v1.11.1 // indirect
140+
github.com/sagikazarmark/locafero v0.6.0 // indirect
141+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
142+
github.com/sasha-s/go-deadlock v0.3.5 // indirect
143+
github.com/sourcegraph/conc v0.3.0 // indirect
144+
github.com/spf13/afero v1.11.0 // indirect
145+
github.com/subosito/gotenv v1.6.0 // indirect
142146
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
143-
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
144147
github.com/ulikunitz/xz v0.5.8 // indirect
145148
github.com/zondax/hid v0.9.2 // indirect
146149
github.com/zondax/ledger-go v0.14.3 // indirect
147-
go.etcd.io/bbolt v1.3.6 // indirect
150+
go.etcd.io/bbolt v1.3.11 // indirect
148151
go.opencensus.io v0.24.0 // indirect
149-
golang.org/x/net v0.9.0 // indirect
150-
golang.org/x/oauth2 v0.5.0 // indirect
151-
golang.org/x/sys v0.7.0 // indirect
152-
golang.org/x/term v0.7.0 // indirect
153-
golang.org/x/text v0.9.0 // indirect
154-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
155-
google.golang.org/api v0.110.0 // indirect
156-
google.golang.org/appengine v1.6.7 // indirect
152+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
153+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
154+
go.opentelemetry.io/otel v1.24.0 // indirect
155+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
156+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
157+
go.uber.org/multierr v1.11.0 // indirect
158+
golang.org/x/net v0.29.0 // indirect
159+
golang.org/x/oauth2 v0.22.0 // indirect
160+
golang.org/x/sync v0.8.0 // indirect
161+
golang.org/x/sys v0.25.0 // indirect
162+
golang.org/x/term v0.24.0 // indirect
163+
golang.org/x/text v0.18.0 // indirect
164+
golang.org/x/time v0.5.0 // indirect
165+
google.golang.org/api v0.171.0 // indirect
166+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
167+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
157168
gopkg.in/ini.v1 v1.67.0 // indirect
158169
gopkg.in/yaml.v2 v2.4.0 // indirect
159170
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -174,7 +185,7 @@ replace (
174185
// replace broken goleveldb.
175186
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
176187
// use cometbft
177-
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29
188+
github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.35
178189
)
179190

180191
retract (

0 commit comments

Comments
 (0)