Skip to content

Commit 362db18

Browse files
authored
Merge pull request #470 from rocket-pool/dev_v2
Merge Dev v2 into v2
2 parents f04cf58 + 98d8d47 commit 362db18

248 files changed

Lines changed: 2513 additions & 2463 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/go.mod

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ toolchain go1.21.1
77
require (
88
github.com/alessio/shellescape v1.4.2
99
github.com/blang/semver/v4 v4.0.0
10-
github.com/docker/docker v24.0.7+incompatible
10+
github.com/docker/docker v26.0.0+incompatible
1111
github.com/dustin/go-humanize v1.0.1
12-
github.com/ethereum/go-ethereum v1.13.11
12+
github.com/ethereum/go-ethereum v1.13.14
1313
github.com/fatih/color v1.16.0
14-
github.com/gdamore/tcell/v2 v2.6.1-0.20231203215052-2917c3801e73
14+
github.com/gdamore/tcell/v2 v2.7.4
1515
github.com/go-openapi/errors v0.22.0
1616
github.com/go-openapi/runtime v0.28.0
1717
github.com/go-openapi/strfmt v0.23.0
@@ -22,14 +22,14 @@ require (
2222
github.com/hashicorp/go-version v1.6.0
2323
github.com/ipfs/go-cid v0.4.1
2424
github.com/ipfs/go-datastore v0.6.0
25-
github.com/klauspost/compress v1.17.4
25+
github.com/klauspost/compress v1.17.7
2626
github.com/mitchellh/go-homedir v1.1.0
2727
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
28-
github.com/prometheus/client_golang v1.18.0
28+
github.com/prometheus/client_golang v1.19.0
2929
github.com/prysmaticlabs/prysm/v4 v4.2.1
30-
github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854
31-
github.com/rocket-pool/node-manager-core v0.1.1-0.20240325035720-824357e2dad7
32-
github.com/rocket-pool/rocketpool-go v1.8.3-0.20240324192746-e467edda77d1
30+
github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854 // DO NOT UPGRADE
31+
github.com/rocket-pool/node-manager-core v0.1.1-0.20240327091033-29672a3a8134
32+
github.com/rocket-pool/rocketpool-go v1.8.3-0.20240327034231-ad6fd7e143ff
3333
github.com/shirou/gopsutil/v3 v3.24.2
3434
github.com/tyler-smith/go-bip39 v1.1.0
3535
github.com/wealdtech/go-ens/v3 v3.6.0
@@ -47,8 +47,10 @@ require (
4747
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4848
github.com/btcsuite/btcd v0.24.0 // indirect
4949
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
50-
github.com/distribution/reference v0.5.0 // indirect
50+
github.com/distribution/reference v0.6.0 // indirect
51+
github.com/felixge/httpsnoop v1.0.4 // indirect
5152
github.com/ferranbt/fastssz v0.1.3 // indirect
53+
github.com/gdamore/encoding v1.0.0 // indirect
5254
github.com/glendc/go-external-ip v0.1.0 // indirect
5355
github.com/go-openapi/analysis v0.23.0 // indirect
5456
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -57,18 +59,21 @@ require (
5759
github.com/go-openapi/spec v0.21.0 // indirect
5860
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
5961
github.com/josharian/intern v1.0.0 // indirect
60-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
62+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
6163
github.com/mailru/easyjson v0.7.7 // indirect
64+
github.com/moby/docker-image-spec v1.3.1 // indirect
6265
github.com/oklog/ulid v1.3.1 // indirect
6366
github.com/opentracing/opentracing-go v1.2.0 // indirect
6467
github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 // indirect
6568
github.com/sethvargo/go-password v0.2.0 // indirect
6669
go.mongodb.org/mongo-driver v1.14.0 // indirect
70+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
6771
go.opentelemetry.io/otel/metric v1.24.0 // indirect
68-
golang.org/x/crypto v0.18.0 // indirect
69-
google.golang.org/api v0.45.0 // indirect
70-
google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
72+
golang.org/x/crypto v0.21.0 // indirect
73+
golang.org/x/time v0.5.0 // indirect
74+
google.golang.org/api v0.171.0 // indirect
75+
google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa // indirect
76+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
7277
)
7378

7479
require (
@@ -81,29 +86,27 @@ require (
8186
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8287
github.com/consensys/bavard v0.1.13 // indirect
8388
github.com/consensys/gnark-crypto v0.12.1 // indirect
84-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
89+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
8590
github.com/crackcomm/go-gitignore v0.0.0-20231225121904-e25f5bc08668 // indirect
8691
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
8792
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
8893
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
89-
github.com/docker/distribution v2.8.3+incompatible // indirect
9094
github.com/docker/go-connections v0.5.0 // indirect
9195
github.com/docker/go-units v0.5.0 // indirect
92-
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
96+
github.com/ethereum/c-kzg-4844 v1.0.1 // indirect
9397
github.com/fsnotify/fsnotify v1.7.0 // indirect
94-
github.com/gdamore/encoding v1.0.0 // indirect
9598
github.com/go-logr/logr v1.4.1 // indirect
9699
github.com/go-logr/stdr v1.2.2 // indirect
97100
github.com/go-ole/go-ole v1.3.0 // indirect
98101
github.com/gogo/protobuf v1.3.2 // indirect
99-
github.com/golang/protobuf v1.5.3 // indirect
102+
github.com/golang/protobuf v1.5.4 // indirect
100103
github.com/gorilla/mux v1.8.1
101104
github.com/gorilla/websocket v1.5.1 // indirect
102-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
103-
github.com/herumi/bls-eth-go-binary v1.33.0 // indirect
105+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
106+
github.com/herumi/bls-eth-go-binary v1.34.1 // indirect
104107
github.com/holiman/uint256 v1.2.4 // indirect
105108
github.com/ipfs/bbloom v0.0.4 // indirect
106-
github.com/ipfs/boxo v0.17.0
109+
github.com/ipfs/boxo v0.18.0
107110
github.com/ipfs/go-bitfield v1.1.0 // indirect
108111
github.com/ipfs/go-block-format v0.2.0 // indirect
109112
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
@@ -131,18 +134,18 @@ require (
131134
github.com/multiformats/go-multihash v0.2.3 // indirect
132135
github.com/multiformats/go-varint v0.0.7 // indirect
133136
github.com/opencontainers/go-digest v1.0.0 // indirect
134-
github.com/opencontainers/image-spec v1.0.2 // indirect
137+
github.com/opencontainers/image-spec v1.1.0 // indirect
135138
github.com/pkg/errors v0.9.1 // indirect
136139
github.com/polydawn/refmt v0.89.0 // indirect
137-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
138-
github.com/prometheus/client_model v0.5.0 // indirect
139-
github.com/prometheus/common v0.46.0 // indirect
140-
github.com/prometheus/procfs v0.12.0 // indirect
140+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
141+
github.com/prometheus/client_model v0.6.0 // indirect
142+
github.com/prometheus/common v0.51.1 // indirect
143+
github.com/prometheus/procfs v0.13.0 // indirect
141144
github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44 // indirect
142-
github.com/prysmaticlabs/gohashtree v0.0.3-alpha // indirect
143-
github.com/rivo/uniseg v0.4.4 // indirect
145+
github.com/prysmaticlabs/gohashtree v0.0.4-beta // indirect
146+
github.com/rivo/uniseg v0.4.7 // indirect
144147
github.com/rocket-pool/batch-query v1.0.0
145-
github.com/rs/cors v1.8.2 // indirect
148+
github.com/rs/cors v1.10.1 // indirect
146149
github.com/russross/blackfriday/v2 v2.1.0 // indirect
147150
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
148151
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -155,21 +158,20 @@ require (
155158
github.com/wealdtech/go-bytesutil v1.2.1 // indirect
156159
github.com/wealdtech/go-multicodec v1.4.0 // indirect
157160
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
158-
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
161+
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
159162
github.com/yusufpapurcu/wmi v1.2.4 // indirect
160163
go.opentelemetry.io/otel v1.24.0 // indirect
161164
go.opentelemetry.io/otel/trace v1.24.0 // indirect
162165
go.uber.org/multierr v1.11.0 // indirect
163-
go.uber.org/zap v1.26.0 // indirect
164-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
165-
golang.org/x/mod v0.14.0 // indirect
166-
golang.org/x/net v0.20.0 // indirect
166+
go.uber.org/zap v1.27.0 // indirect
167+
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
168+
golang.org/x/mod v0.16.0 // indirect
169+
golang.org/x/net v0.22.0 // indirect
167170
golang.org/x/sys v0.18.0 // indirect
168171
golang.org/x/text v0.14.0
169-
golang.org/x/tools v0.17.0 // indirect
170-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
171-
google.golang.org/grpc v1.60.1 // indirect
172-
google.golang.org/protobuf v1.32.0
172+
golang.org/x/tools v0.19.0 // indirect
173+
google.golang.org/grpc v1.62.1 // indirect
174+
google.golang.org/protobuf v1.33.0
173175
lukechampine.com/blake3 v1.2.1 // indirect
174176
rsc.io/tmplfunc v0.0.3 // indirect
175177
)

0 commit comments

Comments
 (0)