Skip to content

Commit 55d0637

Browse files
committed
import mplex separately
1 parent 74dbe6e commit 55d0637

3 files changed

Lines changed: 231 additions & 1238 deletions

File tree

discv5/driver_crawler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
"github.com/ethereum/go-ethereum/crypto/secp256k1"
1515
"github.com/ethereum/go-ethereum/p2p/enode"
1616
"github.com/libp2p/go-libp2p"
17+
"github.com/libp2p/go-libp2p-mplex"
1718
"github.com/libp2p/go-libp2p/core/crypto"
1819
"github.com/libp2p/go-libp2p/core/host"
1920
"github.com/libp2p/go-libp2p/core/network"
2021
"github.com/libp2p/go-libp2p/core/peer"
2122
basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
2223
rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager"
23-
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
2424
"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
2525
"github.com/libp2p/go-libp2p/p2p/security/noise"
2626
"github.com/libp2p/go-libp2p/p2p/transport/tcp"

go.mod

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,101 +6,100 @@ require (
66
contrib.go.opencensus.io/integrations/ocsql v0.1.7
77
github.com/davecgh/go-spew v1.1.1
88
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
9-
github.com/ethereum/go-ethereum v1.13.4
9+
github.com/ethereum/go-ethereum v1.13.5
1010
github.com/friendsofgo/errors v0.9.2
11-
github.com/golang-migrate/migrate/v4 v4.15.2
12-
github.com/hashicorp/golang-lru v0.5.4
11+
github.com/golang-migrate/migrate/v4 v4.16.2
12+
github.com/hashicorp/golang-lru v1.0.2
1313
github.com/lib/pq v1.10.9
14-
github.com/libp2p/go-libp2p v0.28.0
15-
github.com/libp2p/go-libp2p-kad-dht v0.23.0
16-
github.com/libp2p/go-libp2p-kbucket v0.5.0
14+
github.com/libp2p/go-libp2p v0.32.1
15+
github.com/libp2p/go-libp2p-kad-dht v0.25.2
16+
github.com/libp2p/go-libp2p-kbucket v0.6.3
17+
github.com/libp2p/go-libp2p-mplex v0.9.0
1718
github.com/libp2p/go-msgio v0.3.0
18-
github.com/multiformats/go-multiaddr v0.9.0
19+
github.com/multiformats/go-multiaddr v0.12.0
1920
github.com/multiformats/go-multiaddr-dns v0.3.1
20-
github.com/oschwald/geoip2-golang v1.8.0
21-
github.com/prometheus/client_golang v1.15.0
21+
github.com/oschwald/geoip2-golang v1.9.0
22+
github.com/prometheus/client_golang v1.17.0
2223
github.com/protolambda/zrnt v0.30.0
2324
github.com/protolambda/ztyp v0.2.2
24-
github.com/sirupsen/logrus v1.9.0
25+
github.com/sirupsen/logrus v1.9.3
2526
github.com/stretchr/testify v1.8.4
2627
github.com/urfave/cli/v2 v2.25.7
2728
github.com/volatiletech/null/v8 v8.1.2
28-
github.com/volatiletech/sqlboiler/v4 v4.14.2
29-
github.com/volatiletech/strmangle v0.0.4
29+
github.com/volatiletech/sqlboiler/v4 v4.15.0
30+
github.com/volatiletech/strmangle v0.0.5
3031
go.opencensus.io v0.24.0
3132
go.uber.org/atomic v1.11.0
32-
go.uber.org/goleak v1.1.12
33-
golang.org/x/crypto v0.14.0
34-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
35-
golang.org/x/sync v0.3.0
36-
modernc.org/sqlite v1.23.1
33+
go.uber.org/goleak v1.2.1
34+
golang.org/x/crypto v0.16.0
35+
golang.org/x/exp v0.0.0-20231127185646-65229373498e
36+
golang.org/x/sync v0.5.0
37+
modernc.org/sqlite v1.27.0
3738
)
3839

3940
require (
40-
github.com/StackExchange/wmi v1.2.1 // indirect
4141
github.com/benbjohnson/clock v1.3.5 // indirect
4242
github.com/beorn7/perks v1.0.1 // indirect
43-
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
43+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
4444
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4545
github.com/containerd/cgroups v1.1.0 // indirect
4646
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
47-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
47+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
4848
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
4949
github.com/docker/go-units v0.5.0 // indirect
5050
github.com/dustin/go-humanize v1.0.1 // indirect
5151
github.com/elastic/gosigar v0.14.2 // indirect
5252
github.com/ericlagergren/decimal v0.0.0-20221120152707-495c53812d05 // indirect
5353
github.com/flynn/noise v1.0.0 // indirect
5454
github.com/francoispqt/gojay v1.2.13 // indirect
55-
github.com/go-logr/logr v1.2.4 // indirect
55+
github.com/go-logr/logr v1.3.0 // indirect
5656
github.com/go-logr/stdr v1.2.2 // indirect
57-
github.com/go-ole/go-ole v1.2.5 // indirect
57+
github.com/go-ole/go-ole v1.3.0 // indirect
5858
github.com/go-stack/stack v1.8.1 // indirect
5959
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6060
github.com/godbus/dbus/v5 v5.1.0 // indirect
6161
github.com/gofrs/uuid v4.4.0+incompatible // indirect
6262
github.com/gogo/protobuf v1.3.2 // indirect
6363
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64-
github.com/golang/mock v1.6.0 // indirect
65-
github.com/golang/protobuf v1.5.3 // indirect
6664
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
6765
github.com/google/gopacket v1.1.19 // indirect
68-
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
69-
github.com/google/uuid v1.3.0 // indirect
70-
github.com/gorilla/websocket v1.5.0 // indirect
66+
github.com/google/pprof v0.0.0-20231127191134-f3a68a39ae15 // indirect
67+
github.com/google/uuid v1.4.0 // indirect
68+
github.com/gorilla/websocket v1.5.1 // indirect
7169
github.com/hashicorp/errwrap v1.1.0 // indirect
7270
github.com/hashicorp/go-multierror v1.1.1 // indirect
73-
github.com/holiman/uint256 v1.2.3 // indirect
71+
github.com/holiman/uint256 v1.2.4 // indirect
7472
github.com/huin/goupnp v1.3.0 // indirect
75-
github.com/ipfs/boxo v0.8.0 // indirect
73+
github.com/ipfs/boxo v0.15.0 // indirect
7674
github.com/ipfs/go-cid v0.4.1 // indirect
7775
github.com/ipfs/go-datastore v0.6.0 // indirect
78-
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
76+
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
7977
github.com/ipfs/go-log v1.0.5 // indirect
8078
github.com/ipfs/go-log/v2 v2.5.1 // indirect
81-
github.com/ipld/go-ipld-prime v0.20.0 // indirect
79+
github.com/ipld/go-ipld-prime v0.21.0 // indirect
8280
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
8381
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
8482
github.com/jbenet/goprocess v0.1.4 // indirect
8583
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
8684
github.com/kilic/bls12-381 v0.1.0 // indirect
87-
github.com/klauspost/compress v1.16.5 // indirect
88-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
85+
github.com/klauspost/compress v1.17.3 // indirect
86+
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
8987
github.com/koron/go-ssdp v0.0.4 // indirect
9088
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
9189
github.com/libp2p/go-cidranger v1.1.0 // indirect
9290
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
9391
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
9492
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
93+
github.com/libp2p/go-libp2p-routing-helpers v0.7.3 // indirect
9594
github.com/libp2p/go-mplex v0.7.0 // indirect
9695
github.com/libp2p/go-nat v0.2.0 // indirect
9796
github.com/libp2p/go-netroute v0.2.1 // indirect
98-
github.com/libp2p/go-reuseport v0.3.0 // indirect
99-
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
97+
github.com/libp2p/go-reuseport v0.4.0 // indirect
98+
github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
10099
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
101-
github.com/mattn/go-isatty v0.0.19 // indirect
102-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
103-
github.com/miekg/dns v1.1.54 // indirect
100+
github.com/mattn/go-isatty v0.0.20 // indirect
101+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
102+
github.com/miekg/dns v1.1.57 // indirect
104103
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
105104
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
106105
github.com/minio/sha256-simd v1.0.1 // indirect
@@ -110,32 +109,31 @@ require (
110109
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
111110
github.com/multiformats/go-multibase v0.2.0 // indirect
112111
github.com/multiformats/go-multicodec v0.9.0 // indirect
113-
github.com/multiformats/go-multihash v0.2.2 // indirect
114-
github.com/multiformats/go-multistream v0.4.1 // indirect
112+
github.com/multiformats/go-multihash v0.2.3 // indirect
113+
github.com/multiformats/go-multistream v0.5.0 // indirect
115114
github.com/multiformats/go-varint v0.0.7 // indirect
116-
github.com/onsi/ginkgo/v2 v2.9.7 // indirect
117-
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
115+
github.com/onsi/ginkgo/v2 v2.13.1 // indirect
116+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
118117
github.com/opentracing/opentracing-go v1.2.0 // indirect
119-
github.com/oschwald/maxminddb-golang v1.10.0 // indirect
118+
github.com/oschwald/maxminddb-golang v1.12.0 // indirect
120119
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
121120
github.com/pkg/errors v0.9.1 // indirect
122121
github.com/pmezard/go-difflib v1.0.0 // indirect
123122
github.com/polydawn/refmt v0.89.0 // indirect
124-
github.com/prometheus/client_model v0.4.0 // indirect
125-
github.com/prometheus/common v0.42.0 // indirect
126-
github.com/prometheus/procfs v0.9.0 // indirect
123+
github.com/prometheus/client_model v0.5.0 // indirect
124+
github.com/prometheus/common v0.45.0 // indirect
125+
github.com/prometheus/procfs v0.12.0 // indirect
127126
github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7 // indirect
128127
github.com/quic-go/qpack v0.4.0 // indirect
129-
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
130-
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
131-
github.com/quic-go/quic-go v0.33.0 // indirect
132-
github.com/quic-go/webtransport-go v0.5.3 // indirect
128+
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
129+
github.com/quic-go/quic-go v0.40.0 // indirect
130+
github.com/quic-go/webtransport-go v0.6.0 // indirect
133131
github.com/raulk/go-watchdog v1.3.0 // indirect
134132
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
135133
github.com/russross/blackfriday/v2 v2.1.0 // indirect
136-
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
134+
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
137135
github.com/spaolacci/murmur3 v1.1.0 // indirect
138-
github.com/spf13/cast v1.5.0 // indirect
136+
github.com/spf13/cast v1.6.0 // indirect
139137
github.com/stretchr/objx v0.5.0 // indirect
140138
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
141139
github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -144,29 +142,32 @@ require (
144142
github.com/volatiletech/randomize v0.0.1 // indirect
145143
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
146144
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
147-
go.opentelemetry.io/otel v1.14.0 // indirect
148-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
149-
go.uber.org/dig v1.17.0 // indirect
150-
go.uber.org/fx v1.19.2 // indirect
145+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
146+
go.opentelemetry.io/otel v1.21.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
149+
go.uber.org/dig v1.17.1 // indirect
150+
go.uber.org/fx v1.20.1 // indirect
151+
go.uber.org/mock v0.3.0 // indirect
151152
go.uber.org/multierr v1.11.0 // indirect
152-
go.uber.org/zap v1.24.0 // indirect
153-
golang.org/x/mod v0.12.0 // indirect
154-
golang.org/x/net v0.17.0 // indirect
155-
golang.org/x/sys v0.13.0 // indirect
156-
golang.org/x/text v0.13.0 // indirect
157-
golang.org/x/tools v0.13.0 // indirect
158-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
159-
gonum.org/v1/gonum v0.12.0 // indirect
160-
google.golang.org/protobuf v1.30.0 // indirect
153+
go.uber.org/zap v1.26.0 // indirect
154+
golang.org/x/mod v0.14.0 // indirect
155+
golang.org/x/net v0.19.0 // indirect
156+
golang.org/x/sys v0.15.0 // indirect
157+
golang.org/x/text v0.14.0 // indirect
158+
golang.org/x/tools v0.16.0 // indirect
159+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
160+
gonum.org/v1/gonum v0.14.0 // indirect
161+
google.golang.org/protobuf v1.31.0 // indirect
161162
gopkg.in/yaml.v3 v3.0.1 // indirect
162163
lukechampine.com/blake3 v1.2.1 // indirect
163164
lukechampine.com/uint128 v1.3.0 // indirect
164-
modernc.org/cc/v3 v3.40.0 // indirect
165-
modernc.org/ccgo/v3 v3.16.13 // indirect
166-
modernc.org/libc v1.22.5 // indirect
167-
modernc.org/mathutil v1.5.0 // indirect
168-
modernc.org/memory v1.5.0 // indirect
165+
modernc.org/cc/v3 v3.41.0 // indirect
166+
modernc.org/ccgo/v3 v3.16.15 // indirect
167+
modernc.org/libc v1.34.11 // indirect
168+
modernc.org/mathutil v1.6.0 // indirect
169+
modernc.org/memory v1.7.2 // indirect
169170
modernc.org/opt v0.1.3 // indirect
170-
modernc.org/strutil v1.1.3 // indirect
171+
modernc.org/strutil v1.2.0 // indirect
171172
modernc.org/token v1.1.0 // indirect
172173
)

0 commit comments

Comments
 (0)