upstream v2.60.2

node-real · Jun 27, 2024 · bf8259c · bf8259c
1 parent c64b0cf
commit bf8259c
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 55 deletions.
diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum
@@ -415,8 +415,8 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
-github.com/showwin/speedtest-go v1.6.12 h1:q+hWNn2cM35KkqtXGGbSmuJgd67gTP8+VlneY2hq9vU=
-github.com/showwin/speedtest-go v1.6.12/go.mod h1:uLgdWCNarXxlYsL2E5TOZpCIwpgSWnEANZp7gfHXHu0=
+github.com/showwin/speedtest-go v1.7.7 h1:VmK75SZOTKiuWjIVrs+mo7ZoKEw0utiGCvpnurS0olU=
+github.com/showwin/speedtest-go v1.7.7/go.mod h1:uLgdWCNarXxlYsL2E5TOZpCIwpgSWnEANZp7gfHXHu0=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

diff --git a/go.mod b/go.mod
@@ -70,7 +70,7 @@ require (
  github.com/klauspost/compress v1.17.6
  github.com/ledgerwatch/erigon-lib v1.0.0
  github.com/ledgerwatch/erigonwatch v0.1.2
- github.com/libp2p/go-libp2p v0.31.0
+ github.com/libp2p/go-libp2p v0.33.1
  github.com/libp2p/go-libp2p-mplex v0.9.0
  github.com/libp2p/go-libp2p-pubsub v0.10.0
  github.com/maticnetwork/crand v1.0.2
@@ -123,7 +123,7 @@ require (
 )
 
 require (
- github.com/go-ole/go-ole v1.2.6 // indirect
+ github.com/go-ole/go-ole v1.3.0 // indirect
  github.com/tklauser/go-sysconf v0.3.14 // indirect
  github.com/tklauser/numcpus v0.8.0 // indirect
  github.com/yusufpapurcu/wmi v1.2.4 // indirect
@@ -154,39 +154,47 @@ require (
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bits-and-blooms/bitset v1.12.0 // indirect
  github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
- github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
  github.com/cespare/xxhash v1.1.0 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/cilium/ebpf v0.11.0 // indirect
  github.com/consensys/bavard v0.1.13 // indirect
  github.com/containerd/cgroups v1.1.0 // indirect
  github.com/containerd/cgroups/v3 v3.0.3 // indirect
  github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+ github.com/cosmos/gogoproto v1.4.1 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
  github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
  github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
- github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
+ github.com/dgraph-io/ristretto v0.0.4-0.20210318174700-74754f61e018 // indirect
+ github.com/dlclark/regexp2 v1.7.0 // indirect
  github.com/docker/go-units v0.5.0 // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
  github.com/elastic/gosigar v0.14.2 // indirect
- github.com/flynn/noise v1.0.0 // indirect
+ github.com/ferranbt/fastssz v0.0.0-20210905181407-59cf6761a7d5 // indirect
+ github.com/flynn/noise v1.1.0 // indirect
  github.com/francoispqt/gojay v1.2.13 // indirect
- github.com/fsnotify/fsnotify v1.5.4 // indirect
+ github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/garslo/gogen v0.0.0-20170307003452-d6ebae628c7c // indirect
+ github.com/go-kit/kit v0.12.0 // indirect
+ github.com/go-kit/log v0.2.1 // indirect
  github.com/go-llsqlite/adapter v0.0.0-20230927005056-7f5ce7f0c916 // indirect
  github.com/go-llsqlite/crawshaw v0.4.0 // indirect
- github.com/go-logr/logr v1.2.4 // indirect
+ github.com/go-logfmt/logfmt v0.5.1 // indirect
+ github.com/go-logr/logr v1.3.0 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
  github.com/go-stack/stack v1.8.1 // indirect
  github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
  github.com/godbus/dbus/v5 v5.1.0 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/mock v1.6.0 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
  github.com/google/gopacket v1.1.19 // indirect
  github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd // indirect
+ github.com/gtank/merlin v0.1.1 // indirect
+ github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
+ github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e // indirect
  github.com/ianlancetaylor/cgosymbolizer v0.0.0-20220405231054-a1ae3e4bba26 // indirect
- github.com/imdario/mergo v0.3.11 // indirect
+ github.com/imdario/mergo v0.3.13 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/ipfs/go-cid v0.4.1 // indirect
  github.com/ipfs/go-log/v2 v2.5.1 // indirect
@@ -195,11 +203,10 @@ require (
  github.com/koron/go-ssdp v0.0.4 // indirect
  github.com/kr/pretty v0.3.1 // indirect
  github.com/kr/text v0.2.0 // indirect
- github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240509031412-4975b6ec206f // indirect
+ github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240619030755-1e16b374e6cb // indirect
  github.com/libp2p/go-buffer-pool v0.1.0 // indirect
- github.com/libp2p/go-cidranger v1.1.0 // indirect
  github.com/libp2p/go-flow-metrics v0.1.0 // indirect
- github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
+ github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
  github.com/libp2p/go-mplex v0.7.0 // indirect
  github.com/libp2p/go-msgio v0.3.0 // indirect
  github.com/libp2p/go-nat v0.2.0 // indirect
@@ -210,16 +217,19 @@ require (
  github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.20 // indirect
- github.com/miekg/dns v1.1.55 // indirect
+ github.com/mattn/go-runewidth v0.0.15 // indirect
+ github.com/miekg/dns v1.1.58 // indirect
  github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
  github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
+ github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
  github.com/minio/sha256-simd v1.0.1 // indirect
  github.com/mitchellh/copystructure v1.0.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.0 // indirect
  github.com/mmcloughlin/addchain v0.4.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
  github.com/mr-tron/base58 v1.2.0 // indirect
  github.com/mschoch/smat v0.2.0 // indirect
  github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -229,59 +239,63 @@ require (
  github.com/multiformats/go-multibase v0.2.0 // indirect
  github.com/multiformats/go-multicodec v0.9.0 // indirect
  github.com/multiformats/go-multihash v0.2.3 // indirect
- github.com/multiformats/go-multistream v0.4.1 // indirect
+ github.com/multiformats/go-multistream v0.5.0 // indirect
  github.com/multiformats/go-varint v0.0.7 // indirect
  github.com/ncruces/go-strftime v0.1.9 // indirect
- github.com/onsi/ginkgo/v2 v2.11.0 // indirect
+ github.com/onsi/ginkgo/v2 v2.15.0 // indirect
  github.com/opencontainers/runtime-spec v1.2.0 // indirect
  github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
- github.com/pion/datachannel v1.5.2 // indirect
- github.com/pion/dtls/v2 v2.2.4 // indirect
- github.com/pion/ice/v2 v2.2.6 // indirect
- github.com/pion/interceptor v0.1.11 // indirect
+ github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+ github.com/pion/datachannel v1.5.5 // indirect
+ github.com/pion/dtls/v2 v2.2.8 // indirect
+ github.com/pion/ice/v2 v2.3.11 // indirect
+ github.com/pion/interceptor v0.1.25 // indirect
  github.com/pion/logging v0.2.2 // indirect
- github.com/pion/mdns v0.0.5 // indirect
- github.com/pion/rtcp v1.2.9 // indirect
- github.com/pion/rtp v1.7.13 // indirect
- github.com/pion/sctp v1.8.2 // indirect
- github.com/pion/sdp/v3 v3.0.5 // indirect
- github.com/pion/srtp/v2 v2.0.9 // indirect
- github.com/pion/transport v0.13.1 // indirect
- github.com/pion/transport/v2 v2.0.0 // indirect
- github.com/pion/turn/v2 v2.0.8 // indirect
- github.com/pion/udp v0.1.4 // indirect
- github.com/pion/webrtc/v3 v3.1.42 // indirect
+ github.com/pion/mdns v0.0.9 // indirect
+ github.com/pion/rtcp v1.2.13 // indirect
+ github.com/pion/rtp v1.8.3 // indirect
+ github.com/pion/sctp v1.8.9 // indirect
+ github.com/pion/sdp/v3 v3.0.6 // indirect
+ github.com/pion/srtp/v2 v2.0.18 // indirect
+ github.com/pion/transport/v2 v2.2.4 // indirect
+ github.com/pion/turn/v2 v2.1.4 // indirect
+ github.com/pion/webrtc/v3 v3.2.23 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
  github.com/prometheus/client_golang v1.19.0 // indirect
  github.com/prometheus/client_model v0.6.1 // indirect
  github.com/prometheus/common v0.48.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
+ github.com/prysmaticlabs/eth2-types v0.0.0-20210303084904-c9735a06829d // indirect
+ github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44 // indirect
+ github.com/prysmaticlabs/prysm v0.0.0-20220124113610-e26cde5e091b // indirect
  github.com/quic-go/qpack v0.4.0 // indirect
- github.com/quic-go/qtls-go1-20 v0.3.3 // indirect
- github.com/quic-go/quic-go v0.38.2 // indirect
- github.com/quic-go/webtransport-go v0.5.3 // indirect
+ github.com/quic-go/quic-go v0.42.0 // indirect
+ github.com/quic-go/webtransport-go v0.6.0 // indirect
  github.com/raulk/go-watchdog v1.3.0 // indirect
+ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
  github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+ github.com/rivo/uniseg v0.4.4 // indirect
  github.com/rogpeppe/go-internal v1.12.0 // indirect
  github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/sasha-s/go-deadlock v0.3.1 // indirect
  github.com/shirou/gopsutil/v3 v3.24.3 // indirect
  github.com/shoenig/go-m1cpu v0.1.6 // indirect
  github.com/shopspring/decimal v1.2.0 // indirect
- github.com/showwin/speedtest-go v1.6.12 // indirect
+ github.com/showwin/speedtest-go v1.7.7 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
  github.com/sosodev/duration v1.1.0 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
- github.com/spf13/cast v1.3.1 // indirect
+ github.com/spf13/cast v1.5.0 // indirect
  github.com/stoewer/go-strcase v1.2.0 // indirect
  github.com/supranational/blst v0.3.11 // indirect
  github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
  go.etcd.io/bbolt v1.3.6 // indirect
- go.opentelemetry.io/otel v1.8.0 // indirect
- go.opentelemetry.io/otel/trace v1.8.0 // indirect
- go.uber.org/dig v1.17.0 // indirect
- go.uber.org/fx v1.20.0 // indirect
+ go.opentelemetry.io/otel v1.11.0 // indirect
+ go.opentelemetry.io/otel/trace v1.11.0 // indirect
+ go.uber.org/dig v1.17.1 // indirect
+ go.uber.org/fx v1.20.1 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/mod v0.17.0 // indirect
  golang.org/x/text v0.14.0 // indirect