Skip to content

Commit 5215bf4

Browse files
authored
Merge pull request #76 from ObolNetwork/kalo/bump-charon-v1.1.2
*: bump charon to v1.1.2
2 parents 7869b02 + 9cd2e63 commit 5215bf4

File tree

2 files changed

+74
-69
lines changed

2 files changed

+74
-69
lines changed

go.mod

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ module github.com/ObolNetwork/lido-dv-exit
33
go 1.22
44

55
require (
6-
github.com/attestantio/go-eth2-client v0.21.7
6+
github.com/attestantio/go-eth2-client v0.21.9
77
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
88
github.com/ferranbt/fastssz v0.1.3
99
github.com/gorilla/handlers v1.5.2
1010
github.com/gorilla/mux v1.8.1
1111
github.com/jonboulle/clockwork v0.4.0
1212
github.com/libp2p/go-libp2p v0.33.2
13-
github.com/obolnetwork/charon v1.0.1
14-
github.com/rs/zerolog v1.32.0
15-
github.com/spf13/cobra v1.8.0
13+
github.com/obolnetwork/charon v1.1.2
14+
github.com/rs/zerolog v1.33.0
15+
github.com/spf13/cobra v1.8.1
1616
github.com/spf13/pflag v1.0.5
17-
github.com/spf13/viper v1.18.2
17+
github.com/spf13/viper v1.19.0
1818
github.com/stretchr/testify v1.9.0
1919
golang.org/x/sync v0.7.0
20-
google.golang.org/protobuf v1.34.1
20+
google.golang.org/protobuf v1.34.2
2121
)
2222

2323
require (
@@ -35,7 +35,7 @@ require (
3535
github.com/flynn/noise v1.1.0 // indirect
3636
github.com/francoispqt/gojay v1.2.13 // indirect
3737
github.com/fsnotify/fsnotify v1.7.0 // indirect
38-
github.com/go-logr/logr v1.4.1 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4141
github.com/goccy/go-yaml v1.11.3 // indirect
@@ -45,11 +45,12 @@ require (
4545
github.com/golang/snappy v0.0.4 // indirect
4646
github.com/google/gofuzz v1.2.0 // indirect
4747
github.com/google/gopacket v1.1.19 // indirect
48-
github.com/google/pprof v0.0.0-20240422182052-72c8669ad3e7 // indirect
48+
github.com/google/pprof v0.0.0-20240622144329-c177fd99eaa9 // indirect
49+
github.com/google/uuid v1.6.0 // indirect
4950
github.com/gorilla/websocket v1.5.1 // indirect
5051
github.com/hashicorp/hcl v1.0.0 // indirect
51-
github.com/herumi/bls-eth-go-binary v1.35.0 // indirect
52-
github.com/holiman/uint256 v1.3.0 // indirect
52+
github.com/herumi/bls-eth-go-binary v1.36.1 // indirect
53+
github.com/holiman/uint256 v1.3.1 // indirect
5354
github.com/huandu/go-clone v1.7.2 // indirect
5455
github.com/huin/goupnp v1.3.0 // indirect
5556
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -58,7 +59,7 @@ require (
5859
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
5960
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
6061
github.com/jsternberg/zap-logfmt v1.3.0 // indirect
61-
github.com/klauspost/compress v1.17.8 // indirect
62+
github.com/klauspost/compress v1.17.9 // indirect
6263
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
6364
github.com/koron/go-ssdp v0.0.4 // indirect
6465
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
@@ -81,7 +82,7 @@ require (
8182
github.com/mr-tron/base58 v1.2.0 // indirect
8283
github.com/multiformats/go-base32 v0.1.0 // indirect
8384
github.com/multiformats/go-base36 v0.2.0 // indirect
84-
github.com/multiformats/go-multiaddr v0.12.3 // indirect
85+
github.com/multiformats/go-multiaddr v0.13.0 // indirect
8586
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
8687
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
8788
github.com/multiformats/go-multibase v0.2.0 // indirect
@@ -96,7 +97,7 @@ require (
9697
github.com/pk910/dynamic-ssz v0.0.3 // indirect
9798
github.com/pkg/errors v0.9.1 // indirect
9899
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
99-
github.com/prometheus/client_golang v1.19.0 // indirect
100+
github.com/prometheus/client_golang v1.19.1 // indirect
100101
github.com/prometheus/client_model v0.6.1 // indirect
101102
github.com/prometheus/common v0.52.3 // indirect
102103
github.com/prometheus/procfs v0.13.0 // indirect
@@ -115,26 +116,26 @@ require (
115116
github.com/spf13/cast v1.6.0 // indirect
116117
github.com/subosito/gotenv v1.6.0 // indirect
117118
github.com/wealdtech/go-eth2-wallet-encryptor-keystorev4 v1.4.1 // indirect
118-
go.opentelemetry.io/otel v1.26.0 // indirect
119+
go.opentelemetry.io/otel v1.28.0 // indirect
119120
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
120-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
121-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
122-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
123-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
121+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect
122+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
123+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
124+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
124125
go.uber.org/dig v1.17.1 // indirect
125126
go.uber.org/fx v1.21.0 // indirect
126127
go.uber.org/mock v0.4.0 // indirect
127128
go.uber.org/multierr v1.11.0 // indirect
128129
go.uber.org/zap v1.27.0 // indirect
129130
golang.org/x/crypto v0.25.0 // indirect
130-
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
131-
golang.org/x/mod v0.17.0 // indirect
132-
golang.org/x/net v0.25.0 // indirect
131+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
132+
golang.org/x/mod v0.19.0 // indirect
133+
golang.org/x/net v0.27.0 // indirect
133134
golang.org/x/sys v0.22.0 // indirect
134135
golang.org/x/term v0.22.0 // indirect
135136
golang.org/x/text v0.16.0 // indirect
136137
golang.org/x/time v0.5.0 // indirect
137-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
138+
golang.org/x/tools v0.23.0 // indirect
138139
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
139140
gopkg.in/Knetic/govaluate.v3 v3.0.0 // indirect
140141
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
@@ -144,3 +145,7 @@ require (
144145
gopkg.in/yaml.v3 v3.0.1 // indirect
145146
lukechampine.com/blake3 v1.2.2 // indirect
146147
)
148+
149+
// We're replacing go-eth2-client with a branch off our fork, at version v0.21.10.
150+
// This is needed to ensure Gnosis compatibility.
151+
replace github.com/attestantio/go-eth2-client => github.com/ObolNetwork/go-eth2-client v0.21.11-0.20240822135044-f0a5b21e02c6

0 commit comments

Comments
 (0)