Skip to content

Commit 6e5f62a

Browse files
konradkonradkonradkonrad
authored
Merge pull request #398 from shutter-network/schmir/go1.21
Update go-libp2p to v0.30.0 and go to 1.21
2 parents 3036dee + 7df28e1 commit 6e5f62a

File tree

7 files changed

+89
-123
lines changed

7 files changed

+89
-123
lines changed

‎.circleci/basis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ executors:
4242

4343
go:
4444
docker:
45-
- image: cimg/go:1.20.3
45+
- image: cimg/go:1.21.0
4646
environment:
4747
GO111MODULE: "on"
4848
PIP_DISABLE_PIP_VERSION_CHECK: "1"
4949
go-integration:
5050
docker:
51-
- image: cimg/go:1.20.3
51+
- image: cimg/go:1.21.0
5252
environment:
5353
GO111MODULE: "on"
5454
PIP_DISABLE_PIP_VERSION_CHECK: "1"
@@ -80,7 +80,7 @@ jobs:
8080
asdf install pre-commit
8181
- restore_cache:
8282
keys:
83-
- go-mod-v6-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
83+
- go-mod-v7-{{ checksum "rolling-shutter/go.sum" }}-{{ checksum "rolling-shutter/go.mod" }}
8484
- restore_cache:
8585
key: pre-commit-cache-v11-{{ checksum ".pre-commit-config.yaml" }}
8686
- run: pre-commit install-hooks

‎.circleci/rolling-shutter.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
path: ~/src
5252
- restore_cache:
5353
keys:
54-
- go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
54+
- go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5555
- run: go get -d ./...
5656
- save_cache:
57-
key: go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
57+
key: go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
5858
paths:
5959
- ~/go/pkg/
6060
- restore_cache:
6161
keys:
62-
- rs-build-<< parameters.go-version >>-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
62+
- rs-build-<< parameters.go-version >>-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
6363
- install-asdf
6464
- run:
6565
name: "Install asdf plugins"
@@ -90,7 +90,7 @@ jobs:
9090
- store_test_results:
9191
path: report
9292
- save_cache:
93-
key: rs-build-<< parameters.go-version >>-v3-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
93+
key: rs-build-<< parameters.go-version >>-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
9494
paths:
9595
- "~/.cache/go-build"
9696

@@ -186,7 +186,7 @@ jobs:
186186
path: ~/src
187187
- restore_cache:
188188
keys:
189-
- go-mod-v6-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
189+
- go-mod-v7-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
190190
- restore_cache:
191191
keys:
192192
- rs-lint-v13-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}

‎.tool-versions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
babashka 1.3.182
2-
binaryen 112
2+
binaryen 114
33
circleci 0.1.28811
44
clojure 1.11.1.1386
5-
golang 1.20.3
5+
golang 1.21.0
66
golangci-lint 1.54.1
77
java temurin-17.0.5+8
88
nodejs 18.17.0
@@ -12,4 +12,4 @@ protoc 22.3
1212
shfmt 3.7.0
1313
solidity 0.8.9
1414
sqlc 1.19.1
15-
tinygo 0.27.0
15+
tinygo 0.29.0

‎docker/build-src/snapshot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20 as builder
1+
FROM golang:1.21 as builder
22
ENV GOMODCACHE=/root/.cache/mod
33
# Fetch go modules separately to improve cache usage
44
RUN mkdir /gomod

‎play/src/sht/collator_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
:loop/checks [{:check :collator/decryption-trigger}]}
129129
{:check :loop/until
130130
:loop/description "batchtx generation should work"
131-
:loop/timeout-ms (* 20 1000)
131+
:loop/timeout-ms (* 22 1000)
132132
:loop/checks [{:check :collator/have-batch-tx
133133
:collator/num-batchtxs 5}]}
134134
;; {:check :loop/forever}

‎rolling-shutter/go.mod

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ require (
1717
github.com/jackc/pgx/v4 v4.18.1
1818
github.com/justinas/alice v1.2.0
1919
github.com/kr/pretty v0.3.1
20-
github.com/libp2p/go-libp2p v0.26.4
20+
github.com/libp2p/go-libp2p v0.30.0
2121
github.com/libp2p/go-libp2p-kad-dht v0.21.1
2222
github.com/libp2p/go-libp2p-pubsub v0.9.3
2323
github.com/mitchellh/mapstructure v1.5.0
24-
github.com/multiformats/go-multiaddr v0.9.0
24+
github.com/multiformats/go-multiaddr v0.11.0
2525
github.com/pelletier/go-toml/v2 v2.0.9
2626
github.com/pkg/errors v0.9.1
2727
github.com/prometheus/client_golang v1.14.0
@@ -41,8 +41,8 @@ require (
4141
go.opentelemetry.io/otel/sdk/metric v0.37.0
4242
go.opentelemetry.io/otel/trace v1.14.0
4343
go.opentelemetry.io/proto/otlp v0.19.0
44-
golang.org/x/crypto v0.7.0
45-
golang.org/x/sync v0.1.0
44+
golang.org/x/crypto v0.12.0
45+
golang.org/x/sync v0.3.0
4646
google.golang.org/protobuf v1.30.0
4747
gotest.tools v2.2.0+incompatible
4848
gotest.tools/v3 v3.2.0
@@ -62,7 +62,7 @@ require (
6262
github.com/davecgh/go-spew v1.1.1 // indirect
6363
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
6464
github.com/deckarep/golang-set v1.8.0 // indirect
65-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
65+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
6666
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
6767
github.com/dgraph-io/ristretto v0.0.3 // indirect
6868
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
@@ -82,7 +82,7 @@ require (
8282
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8383
github.com/go-openapi/swag v0.22.4 // indirect
8484
github.com/go-stack/stack v1.8.1 // indirect
85-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
85+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
8686
github.com/godbus/dbus/v5 v5.1.0 // indirect
8787
github.com/gogo/protobuf v1.3.2 // indirect
8888
github.com/golang/mock v1.6.0 // indirect
@@ -91,7 +91,7 @@ require (
9191
github.com/google/btree v1.0.1 // indirect
9292
github.com/google/gopacket v1.1.19 // indirect
9393
github.com/google/orderedcode v0.0.1 // indirect
94-
github.com/google/pprof v0.0.0-20230811205829-9131a7e9cc17 // indirect
94+
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
9595
github.com/gorilla/mux v1.8.0 // indirect
9696
github.com/gorilla/websocket v1.5.0 // indirect
9797
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
@@ -104,7 +104,7 @@ require (
104104
github.com/hashicorp/hcl v1.0.0 // indirect
105105
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
106106
github.com/holiman/uint256 v1.2.3 // indirect
107-
github.com/huin/goupnp v1.1.0 // indirect
107+
github.com/huin/goupnp v1.2.0 // indirect
108108
github.com/inconshreveable/mousetrap v1.0.1 // indirect
109109
github.com/ipfs/go-cid v0.4.1 // indirect
110110
github.com/ipfs/go-datastore v0.6.0 // indirect
@@ -138,9 +138,9 @@ require (
138138
github.com/libp2p/go-libp2p-kbucket v0.5.0 // indirect
139139
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
140140
github.com/libp2p/go-msgio v0.3.0 // indirect
141-
github.com/libp2p/go-nat v0.1.0 // indirect
141+
github.com/libp2p/go-nat v0.2.0 // indirect
142142
github.com/libp2p/go-netroute v0.2.1 // indirect
143-
github.com/libp2p/go-reuseport v0.2.0 // indirect
143+
github.com/libp2p/go-reuseport v0.4.0 // indirect
144144
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
145145
github.com/magiconair/properties v1.8.7 // indirect
146146
github.com/mailru/easyjson v0.7.7 // indirect
@@ -162,28 +162,27 @@ require (
162162
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
163163
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
164164
github.com/multiformats/go-multibase v0.2.0 // indirect
165-
github.com/multiformats/go-multicodec v0.8.1 // indirect
165+
github.com/multiformats/go-multicodec v0.9.0 // indirect
166166
github.com/multiformats/go-multihash v0.2.3 // indirect
167167
github.com/multiformats/go-multistream v0.4.1 // indirect
168168
github.com/multiformats/go-varint v0.0.7 // indirect
169169
github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce // indirect
170170
github.com/olekukonko/tablewriter v0.0.5 // indirect
171-
github.com/onsi/ginkgo/v2 v2.8.4 // indirect
171+
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
172172
github.com/opencontainers/runtime-spec v1.1.0 // indirect
173173
github.com/opentracing/opentracing-go v1.2.0 // indirect
174174
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
175175
github.com/pelletier/go-toml v1.9.5 // indirect
176176
github.com/petermattis/goid v0.0.0-20230808133559-b036b712a89b // indirect
177177
github.com/pmezard/go-difflib v1.0.0 // indirect
178178
github.com/polydawn/refmt v0.89.0 // indirect
179-
github.com/prometheus/client_model v0.3.0 // indirect
179+
github.com/prometheus/client_model v0.4.0 // indirect
180180
github.com/prometheus/common v0.40.0 // indirect
181181
github.com/prometheus/procfs v0.9.0 // indirect
182182
github.com/prometheus/tsdb v0.7.1 // indirect
183183
github.com/quic-go/qpack v0.4.0 // indirect
184-
github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
185-
github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
186-
github.com/quic-go/quic-go v0.33.1 // indirect
184+
github.com/quic-go/qtls-go1-20 v0.3.2 // indirect
185+
github.com/quic-go/quic-go v0.37.6 // indirect
187186
github.com/quic-go/webtransport-go v0.5.3 // indirect
188187
github.com/raulk/go-watchdog v1.3.0 // indirect
189188
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
@@ -210,25 +209,23 @@ require (
210209
github.com/yusufpapurcu/wmi v1.2.3 // indirect
211210
go.etcd.io/bbolt v1.3.7 // indirect
212211
go.opencensus.io v0.24.0 // indirect
213-
go.uber.org/atomic v1.10.0 // indirect
214-
go.uber.org/dig v1.16.1 // indirect
215-
go.uber.org/fx v1.19.3 // indirect
212+
go.uber.org/dig v1.17.0 // indirect
213+
go.uber.org/fx v1.20.0 // indirect
216214
go.uber.org/multierr v1.11.0 // indirect
217-
go.uber.org/zap v1.24.0 // indirect
218-
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
219-
golang.org/x/mod v0.11.0 // indirect
220-
golang.org/x/net v0.8.0 // indirect
215+
go.uber.org/zap v1.25.0 // indirect
216+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
217+
golang.org/x/mod v0.12.0 // indirect
218+
golang.org/x/net v0.14.0 // indirect
221219
golang.org/x/sys v0.11.0 // indirect
222-
golang.org/x/text v0.9.0 // indirect
223-
golang.org/x/tools v0.6.0 // indirect
220+
golang.org/x/text v0.12.0 // indirect
221+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
224222
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
225223
google.golang.org/grpc v1.54.1 // indirect
226224
gopkg.in/ini.v1 v1.66.6 // indirect
227225
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
228226
gopkg.in/yaml.v2 v2.4.0 // indirect
229227
gopkg.in/yaml.v3 v3.0.1 // indirect
230-
lukechampine.com/blake3 v1.1.7 // indirect
231-
nhooyr.io/websocket v1.8.7 // indirect
228+
lukechampine.com/blake3 v1.2.1 // indirect
232229
)
233230

234231
replace github.com/bitwurx/jrpc2 => github.com/ulope/jrpc2 v0.0.0-20230706135348-a95cf3d96bd2

0 commit comments

Comments
 (0)