Skip to content

Commit 5de6338

Browse files
[Backport] Upgrade Go and libp2p versions (#3779)
This pull request backports #3771 to the `releases/mainnet/v2.0.0-m7` branch.
2 parents 0eff70f + 9d2e716 commit 5de6338

28 files changed

+620
-1261
lines changed

.github/workflows/client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ jobs:
295295
- name: Staticcheck
296296
uses: dominikh/staticcheck-action@v1.3.0
297297
with:
298-
version: "2022.1.3"
298+
version: "2023.1.6"
299299
install-go: false
300300

301301
client-integration-test:

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18.10-alpine3.16 AS build-sources
1+
FROM golang:1.20.13-alpine3.19 AS build-sources
22

33
ENV GOPATH=/go \
44
GOBIN=/go/bin \
@@ -37,7 +37,7 @@ COPY go.mod go.sum $APP_DIR/
3737
RUN go mod download
3838

3939
# Install code generators.
40-
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
40+
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0
4141

4242
# Copy source code for generation.
4343
COPY ./pkg/beacon/dkg/result/gen $APP_DIR/pkg/beacon/dkg/result/gen
@@ -83,7 +83,7 @@ RUN GOOS=linux make build \
8383
version=$VERSION \
8484
revision=$REVISION
8585

86-
FROM alpine:3.16 as runtime-docker
86+
FROM alpine:3.19 as runtime-docker
8787

8888
ENV APP_NAME=keep-client \
8989
APP_DIR=/go/src/github.com/keep-network/keep-core \
@@ -100,7 +100,7 @@ CMD []
100100
#
101101
# Build Binaries
102102
#
103-
FROM golang:1.18.3-bullseye AS build-bins
103+
FROM golang:1.20.13-bullseye AS build-bins
104104

105105
ENV APP_DIR=/go/src/github.com/keep-network/keep-core
106106

cmd/maintainercli.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,12 +501,14 @@ var estimateDepositsSweepFeeCommand = cobra.Command{
501501
// printDepositsSweepFeeTable prints estimated fees for specific deposits counts
502502
// to the standard output. For example:
503503
//
504-
// ---------------------------------------------
505-
// deposits count total fee (satoshis) sat/vbyte
506-
// 1 201 1
507-
// 2 292 1
508-
// 3 384 1
509-
// ---------------------------------------------
504+
// --------------------------------------------------
505+
// deposits count total fee (satoshis) sat/vbyte
506+
//
507+
// 1 201 1
508+
// 2 292 1
509+
// 3 384 1
510+
//
511+
// --------------------------------------------------
510512
func printDepositsSweepFeeTable(
511513
fees map[int]struct {
512514
TotalFee int64

go.mod

Lines changed: 88 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/keep-network/keep-core
22

3-
go 1.18
3+
go 1.20
44

55
replace (
66
github.com/bnb-chain/tss-lib => github.com/threshold-network/tss-lib v0.0.0-20230901144531-2e712689cfbe
@@ -25,150 +25,134 @@ require (
2525
github.com/checksum0/go-electrum v0.0.0-20220912200153-b862ac442cf9
2626
github.com/ethereum/go-ethereum v1.10.19
2727
github.com/go-test/deep v1.0.8
28-
github.com/golang/protobuf v1.5.2
2928
github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa
3029
github.com/hashicorp/go-multierror v1.1.1
31-
github.com/ipfs/go-datastore v0.5.1
32-
github.com/ipfs/go-ipfs-config v0.16.0
30+
github.com/ipfs/go-datastore v0.6.0
31+
github.com/ipfs/go-ipfs-config v0.0.4
3332
github.com/ipfs/go-log v1.0.5
3433
github.com/ipfs/go-log/v2 v2.5.1
3534
github.com/jbenet/goprocess v0.1.4
3635
github.com/keep-network/keep-common v1.7.1-0.20230501122407-5cc3757ccf0d
3736
github.com/libp2p/go-addr-util v0.2.0
38-
github.com/libp2p/go-libp2p v0.20.1
39-
github.com/libp2p/go-libp2p-core v0.16.1
40-
github.com/libp2p/go-libp2p-kad-dht v0.16.0
41-
github.com/libp2p/go-libp2p-pubsub v0.7.0
37+
github.com/libp2p/go-libp2p v0.32.2
38+
github.com/libp2p/go-libp2p-kad-dht v0.25.2
39+
github.com/libp2p/go-libp2p-pubsub v0.10.0
4240
github.com/mitchellh/mapstructure v1.5.0
43-
github.com/multiformats/go-multiaddr v0.5.0
41+
github.com/multiformats/go-multiaddr v0.12.0
4442
github.com/spf13/cobra v1.5.0
4543
github.com/spf13/pflag v1.0.5
4644
github.com/spf13/viper v1.12.0
47-
go.uber.org/zap v1.21.0
48-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
49-
golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5
50-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
51-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
52-
google.golang.org/protobuf v1.30.0
45+
go.uber.org/zap v1.26.0
46+
golang.org/x/crypto v0.14.0
47+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
48+
golang.org/x/sync v0.4.0
49+
golang.org/x/term v0.13.0
50+
google.golang.org/protobuf v1.31.0
5351
google.golang.org/protobuf/dev v0.0.0-00010101000000-000000000000
5452
)
5553

5654
require (
5755
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
5856
github.com/aead/siphash v1.0.1 // indirect
5957
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
60-
github.com/benbjohnson/clock v1.3.0 // indirect
58+
github.com/benbjohnson/clock v1.3.5 // indirect
6159
github.com/beorn7/perks v1.0.1 // indirect
6260
github.com/btcsuite/btcd/btcutil v1.1.1 // indirect
6361
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
64-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
65-
github.com/cheekybits/genny v1.0.0 // indirect
66-
github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327 // indirect
67-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
62+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
63+
github.com/containerd/cgroups v1.1.0 // indirect
64+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6865
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
6966
github.com/deckarep/golang-set v1.8.0 // indirect
7067
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.0 // indirect
71-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
72-
github.com/docker/go-units v0.4.0 // indirect
73-
github.com/elastic/gosigar v0.12.0 // indirect
68+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
69+
github.com/docker/go-units v0.5.0 // indirect
70+
github.com/elastic/gosigar v0.14.2 // indirect
7471
github.com/flynn/noise v1.0.0 // indirect
7572
github.com/francoispqt/gojay v1.2.13 // indirect
7673
github.com/fsnotify/fsnotify v1.5.4 // indirect
74+
github.com/go-logr/logr v1.2.4 // indirect
75+
github.com/go-logr/stdr v1.2.2 // indirect
7776
github.com/go-ole/go-ole v1.2.1 // indirect
7877
github.com/go-stack/stack v1.8.0 // indirect
79-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
80-
github.com/godbus/dbus/v5 v5.0.4 // indirect
78+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
79+
github.com/godbus/dbus/v5 v5.1.0 // indirect
8180
github.com/gogo/protobuf v1.3.2 // indirect
81+
github.com/golang/protobuf v1.5.3 // indirect
8282
github.com/google/gopacket v1.1.19 // indirect
83+
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
8384
github.com/google/uuid v1.3.0 // indirect
8485
github.com/gorilla/websocket v1.5.0 // indirect
8586
github.com/hashicorp/errwrap v1.1.0 // indirect
8687
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
88+
github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
8789
github.com/hashicorp/hcl v1.0.0 // indirect
88-
github.com/huin/goupnp v1.0.3 // indirect
90+
github.com/huin/goupnp v1.3.0 // indirect
8991
github.com/inconshreveable/mousetrap v1.0.0 // indirect
90-
github.com/ipfs/bbloom v0.0.4 // indirect
91-
github.com/ipfs/go-block-format v0.0.3 // indirect
92-
github.com/ipfs/go-blockservice v0.3.0 // indirect
93-
github.com/ipfs/go-cid v0.2.0 // indirect
94-
github.com/ipfs/go-ipfs-blockstore v1.2.0 // indirect
95-
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
96-
github.com/ipfs/go-ipfs-exchange-interface v0.1.0 // indirect
97-
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
98-
github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
99-
github.com/ipfs/go-ipld-format v0.3.0 // indirect
100-
github.com/ipfs/go-ipld-legacy v0.1.0 // indirect
101-
github.com/ipfs/go-ipns v0.1.2 // indirect
102-
github.com/ipfs/go-merkledag v0.6.0 // indirect
103-
github.com/ipfs/go-metrics-interface v0.0.1 // indirect
104-
github.com/ipfs/go-verifcid v0.0.1 // indirect
105-
github.com/ipfs/interface-go-ipfs-core v0.7.0 // indirect
106-
github.com/ipld/go-codec-dagpb v1.3.0 // indirect
107-
github.com/ipld/go-ipld-prime v0.16.0 // indirect
92+
github.com/ipfs/boxo v0.10.0 // indirect
93+
github.com/ipfs/go-cid v0.4.1 // indirect
94+
github.com/ipfs/go-ipfs-addr v0.0.1 // indirect
95+
github.com/ipld/go-ipld-prime v0.20.0 // indirect
10896
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
10997
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
11098
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 // indirect
111-
github.com/klauspost/compress v1.15.1 // indirect
112-
github.com/klauspost/cpuid/v2 v2.0.12 // indirect
113-
github.com/koron/go-ssdp v0.0.2 // indirect
114-
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
99+
github.com/klauspost/compress v1.17.2 // indirect
100+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
101+
github.com/koron/go-ssdp v0.0.4 // indirect
102+
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
115103
github.com/libp2p/go-cidranger v1.1.0 // indirect
116-
github.com/libp2p/go-eventbus v0.2.1 // indirect
117-
github.com/libp2p/go-flow-metrics v0.0.3 // indirect
118-
github.com/libp2p/go-libp2p-asn-util v0.2.0 // indirect
119-
github.com/libp2p/go-libp2p-discovery v0.6.0 // indirect
120-
github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
121-
github.com/libp2p/go-libp2p-peerstore v0.6.0 // indirect
122-
github.com/libp2p/go-libp2p-record v0.1.3 // indirect
123-
github.com/libp2p/go-libp2p-resource-manager v0.3.0 // indirect
124-
github.com/libp2p/go-msgio v0.2.0 // indirect
125-
github.com/libp2p/go-nat v0.1.0 // indirect
126-
github.com/libp2p/go-netroute v0.2.0 // indirect
127-
github.com/libp2p/go-openssl v0.0.7 // indirect
128-
github.com/libp2p/go-reuseport v0.2.0 // indirect
129-
github.com/libp2p/go-yamux/v3 v3.1.2 // indirect
130-
github.com/lucas-clemente/quic-go v0.27.1 // indirect
104+
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
105+
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
106+
github.com/libp2p/go-libp2p-crypto v0.0.2 // indirect
107+
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
108+
github.com/libp2p/go-libp2p-peer v0.1.1 // indirect
109+
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
110+
github.com/libp2p/go-libp2p-routing-helpers v0.7.2 // indirect
111+
github.com/libp2p/go-msgio v0.3.0 // indirect
112+
github.com/libp2p/go-nat v0.2.0 // indirect
113+
github.com/libp2p/go-netroute v0.2.1 // indirect
114+
github.com/libp2p/go-reuseport v0.4.0 // indirect
115+
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
131116
github.com/magiconair/properties v1.8.6 // indirect
132-
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
133-
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
134-
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
135117
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
136-
github.com/mattn/go-isatty v0.0.14 // indirect
137-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
138-
github.com/miekg/dns v1.1.43 // indirect
118+
github.com/mattn/go-isatty v0.0.20 // indirect
119+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
120+
github.com/miekg/dns v1.1.56 // indirect
139121
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
140122
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
141-
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
142-
github.com/minio/sha256-simd v1.0.0 // indirect
123+
github.com/minio/sha256-simd v1.0.1 // indirect
143124
github.com/mitchellh/go-homedir v1.1.0 // indirect
144125
github.com/mr-tron/base58 v1.2.0 // indirect
145-
github.com/multiformats/go-base32 v0.0.4 // indirect
146-
github.com/multiformats/go-base36 v0.1.0 // indirect
126+
github.com/multiformats/go-base32 v0.1.0 // indirect
127+
github.com/multiformats/go-base36 v0.2.0 // indirect
147128
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
148129
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
149-
github.com/multiformats/go-multibase v0.0.3 // indirect
150-
github.com/multiformats/go-multicodec v0.4.1 // indirect
151-
github.com/multiformats/go-multihash v0.1.0 // indirect
152-
github.com/multiformats/go-multistream v0.3.1 // indirect
153-
github.com/multiformats/go-varint v0.0.6 // indirect
154-
github.com/nxadm/tail v1.4.8 // indirect
155-
github.com/onsi/ginkgo v1.16.4 // indirect
156-
github.com/opencontainers/runtime-spec v1.0.2 // indirect
130+
github.com/multiformats/go-multibase v0.2.0 // indirect
131+
github.com/multiformats/go-multicodec v0.9.0 // indirect
132+
github.com/multiformats/go-multihash v0.2.3 // indirect
133+
github.com/multiformats/go-multistream v0.5.0 // indirect
134+
github.com/multiformats/go-varint v0.0.7 // indirect
135+
github.com/onsi/ginkgo/v2 v2.13.0 // indirect
136+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
157137
github.com/opentracing/opentracing-go v1.2.0 // indirect
158138
github.com/otiai10/primes v0.0.0-20180210170552-f6d2a1ba97c4 // indirect
159139
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
160140
github.com/pelletier/go-toml v1.9.5 // indirect
161141
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
162142
github.com/pkg/errors v0.9.1 // indirect
163-
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
164-
github.com/prometheus/client_golang v1.12.1 // indirect
165-
github.com/prometheus/client_model v0.2.0 // indirect
166-
github.com/prometheus/common v0.32.1 // indirect
167-
github.com/prometheus/procfs v0.7.3 // indirect
168-
github.com/raulk/clock v1.1.0 // indirect
169-
github.com/raulk/go-watchdog v1.2.0 // indirect
143+
github.com/polydawn/refmt v0.89.0 // indirect
144+
github.com/prometheus/client_golang v1.16.0 // indirect
145+
github.com/prometheus/client_model v0.4.0 // indirect
146+
github.com/prometheus/common v0.44.0 // indirect
147+
github.com/prometheus/procfs v0.11.1 // indirect
148+
github.com/quic-go/qpack v0.4.0 // indirect
149+
github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
150+
github.com/quic-go/quic-go v0.39.4 // indirect
151+
github.com/quic-go/webtransport-go v0.6.0 // indirect
152+
github.com/raulk/go-watchdog v1.3.0 // indirect
170153
github.com/rjeczalik/notify v0.9.2 // indirect
171154
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
155+
github.com/spacemonkeygo/openssl v0.0.0-20181017203307-c2dcc5cca94a // indirect
172156
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
173157
github.com/spaolacci/murmur3 v1.1.0 // indirect
174158
github.com/spf13/afero v1.8.2 // indirect
@@ -177,24 +161,25 @@ require (
177161
github.com/subosito/gotenv v1.3.0 // indirect
178162
github.com/tklauser/go-sysconf v0.3.5 // indirect
179163
github.com/tklauser/numcpus v0.2.2 // indirect
180-
github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 // indirect
181164
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
182-
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
183-
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
184-
go.opencensus.io v0.23.0 // indirect
185-
go.uber.org/atomic v1.9.0 // indirect
186-
go.uber.org/multierr v1.8.0 // indirect
187-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
188-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
189-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
190-
golang.org/x/text v0.3.7 // indirect
165+
go.opencensus.io v0.24.0 // indirect
166+
go.opentelemetry.io/otel v1.16.0 // indirect
167+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
168+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
169+
go.uber.org/dig v1.17.1 // indirect
170+
go.uber.org/fx v1.20.1 // indirect
171+
go.uber.org/mock v0.3.0 // indirect
172+
go.uber.org/multierr v1.11.0 // indirect
173+
golang.org/x/mod v0.13.0 // indirect
174+
golang.org/x/net v0.17.0 // indirect
175+
golang.org/x/sys v0.13.0 // indirect
176+
golang.org/x/text v0.13.0 // indirect
191177
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
192-
golang.org/x/tools v0.1.11 // indirect
193-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
178+
golang.org/x/tools v0.14.0 // indirect
179+
gonum.org/v1/gonum v0.13.0 // indirect
194180
gopkg.in/ini.v1 v1.66.4 // indirect
195181
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
196-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
197182
gopkg.in/yaml.v2 v2.4.0 // indirect
198-
gopkg.in/yaml.v3 v3.0.0 // indirect
199-
lukechampine.com/blake3 v1.1.7 // indirect
183+
gopkg.in/yaml.v3 v3.0.1 // indirect
184+
lukechampine.com/blake3 v1.2.1 // indirect
200185
)

0 commit comments

Comments
 (0)