chore: update go-libp2p to v0.26 (#9656)
Co-authored-by: Henrique Dias <hacdias@gmail.com>
Marten Seemann committed
Feb 24, 2023 at 01:34 UTC
a3366c522a578db610d8633c5a15ebddb6e96e39
8 files changed
+119
-43
.circleci/main.yml
+8
-7
@@ -234,15 +234,16 @@ jobs:
234
at: /tmp/circleci-workspace
235
- restore_cache:
236
keys:
237
- - v1-interop-{{ .Branch }}-{{ .Revision }}
238
- - v1-interop-{{ .Branch }}-
239
- - v1-interop-
237
+ - v2-interop-{{ .Branch }}-{{ .Revision }}
238
+ - v2-interop-{{ .Branch }}-
239
+ - v2-interop-
240
- run:
241
name: Installing dependencies
242
command: |
243
npm init -y
244
- npm install ipfs@^0.61.0
245
- npm install ipfs-interop@^8.0.10
244
+ npm install ipfs@^0.66.0
245
+ npm install kubo-rpc-client@^3.0.1
246
+ npm install ipfs-interop@^10.0.1
247
npm install mocha-circleci-reporter@0.0.3
248
working_directory: ~/ipfs/kubo/interop
249
- run:
@@ -259,7 +260,7 @@ jobs:
260
- store_test_results:
261
path: /tmp/test-results
262
- save_cache:
262
- key: v1-interop-{{ .Branch }}-{{ .Revision }}
263
+ key: v2-interop-{{ .Branch }}-{{ .Revision }}
264
paths:
265
- ~/ipfs/kubo/interop/node_modules
266
go-ipfs-api:
@@ -292,7 +293,7 @@ jobs:
293
command: go test -count=1 -v ./...
294
working_directory: ~/ipfs/kubo/go-ipfs-api
295
- save_cache:
295
- key: v1-go-api-{{ checksum "~/ipfs/kubo/go-ipfs-api/go.sum" }}
296
+ key: v2-go-api-{{ checksum "~/ipfs/kubo/go-ipfs-api/go.sum" }}
297
paths:
298
- ~/go/pkg/mod
299
- ~/.cache/go-build/
.github/workflows/build.yml
+3
-2
@@ -70,8 +70,9 @@ jobs:
70
- run: mkdir interop
71
- run: |
72
npm init -y
73
- npm install ipfs@^0.61.0
74
- npm install ipfs-interop@^8.0.10
73
+ npm install ipfs@^0.66.0
74
+ npm install kubo-rpc-client@^3.0.1
75
+ npm install ipfs-interop@^10.0.1
76
working-directory: interop
77
- run: npx ipfs-interop -- -t node $(sed -e 's#[^ ]*#-f test/&.js#g' <<< '${{ matrix.suites }}')
78
env:
core/node/libp2p/relay.go
+1
-4
@@ -63,10 +63,7 @@ func MaybeAutoRelay(staticRelays []string, cfgPeering config.Peering, enabled bo
63
}
64
static = append(static, *addr)
65
}
66
- opts.Opts = append(opts.Opts, libp2p.EnableAutoRelayWithStaticRelays(
67
- static,
68
- autorelay.WithCircuitV1Support(),
69
- ))
66
+ opts.Opts = append(opts.Opts, libp2p.EnableAutoRelayWithStaticRelays(static))
67
}
68
return
69
})
docs/examples/kubo-as-a-library/go.mod
+4
-5
@@ -10,7 +10,7 @@ require (
10
github.com/ipfs/go-libipfs v0.6.1-0.20230222011044-7b201415a176
11
github.com/ipfs/interface-go-ipfs-core v0.11.0
12
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
13
- github.com/libp2p/go-libp2p v0.25.2-0.20230214091718-aef956be688d
13
+ github.com/libp2p/go-libp2p v0.26.0
14
github.com/multiformats/go-multiaddr v0.8.0
15
)
16
@@ -164,10 +164,9 @@ require (
164
github.com/prometheus/common v0.37.0 // indirect
165
github.com/prometheus/procfs v0.8.0 // indirect
166
github.com/quic-go/qpack v0.4.0 // indirect
167
- github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
168
- github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
169
- github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
170
- github.com/quic-go/quic-go v0.32.0 // indirect
167
+ github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
168
+ github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
169
+ github.com/quic-go/quic-go v0.33.0 // indirect
170
github.com/quic-go/webtransport-go v0.5.1 // indirect
171
github.com/raulk/go-watchdog v1.3.0 // indirect
172
github.com/samber/lo v1.36.0 // indirect
docs/examples/kubo-as-a-library/go.sum
+8
-10
@@ -730,8 +730,8 @@ github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xS
730
github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
731
github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
732
github.com/libp2p/go-libp2p v0.14.3/go.mod h1:d12V4PdKbpL0T1/gsUNN8DfgMuRPDX8bS2QxCZlwRH0=
733
-github.com/libp2p/go-libp2p v0.25.2-0.20230214091718-aef956be688d h1:OeFN5DlT447jgmKB9LnzUkpykEw8FMuy7wWTL0rAK30=
734
-github.com/libp2p/go-libp2p v0.25.2-0.20230214091718-aef956be688d/go.mod h1:xnK9/1d9+jeQCVvi/f1g12KqtVi/jP/SijtKV1hML3g=
733
+github.com/libp2p/go-libp2p v0.26.0 h1:0FE0bP9/G9YADjruqoFvf1snBBFvrdh1MmTuEeUkl2E=
734
+github.com/libp2p/go-libp2p v0.26.0/go.mod h1:R8N+XhwPDPLNb4TKboKJKnDeg9vPw8+zlC6g793dTGw=
735
github.com/libp2p/go-libp2p-asn-util v0.2.0 h1:rg3+Os8jbnO5DxkC7K/Utdi+DkY3q/d1/1q+8WeNAsw=
736
github.com/libp2p/go-libp2p-asn-util v0.2.0/go.mod h1:WoaWxbHKBymSN41hWSq/lGKJEca7TNm58+gGJi2WsLI=
737
github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
@@ -1171,14 +1171,12 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
1171
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
1172
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
1173
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
1174
-github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
1175
-github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
1176
-github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
1177
-github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
1178
-github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
1179
-github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
1180
-github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
1181
-github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
1174
+github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
1175
+github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
1176
+github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
1177
+github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
1178
+github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
1179
+github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
1180
github.com/quic-go/webtransport-go v0.5.1 h1:1eVb7WDWCRoaeTtFHpFBJ6WDN1bSrPrRoW6tZgSw0Ow=
1181
github.com/quic-go/webtransport-go v0.5.1/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
1182
github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM=
go.mod
+4
-5
@@ -67,7 +67,7 @@ require (
67
github.com/jbenet/go-temp-err-catcher v0.1.0
68
github.com/jbenet/goprocess v0.1.4
69
github.com/libp2p/go-doh-resolver v0.4.0
70
- github.com/libp2p/go-libp2p v0.25.1
70
+ github.com/libp2p/go-libp2p v0.26.0
71
github.com/libp2p/go-libp2p-http v0.4.0
72
github.com/libp2p/go-libp2p-kad-dht v0.21.0
73
github.com/libp2p/go-libp2p-kbucket v0.5.0
@@ -207,10 +207,9 @@ require (
207
github.com/prometheus/procfs v0.8.0 // indirect
208
github.com/prometheus/statsd_exporter v0.21.0 // indirect
209
github.com/quic-go/qpack v0.4.0 // indirect
210
- github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
211
- github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
212
- github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
213
- github.com/quic-go/quic-go v0.32.0 // indirect
210
+ github.com/quic-go/qtls-go1-19 v0.2.1 // indirect
211
+ github.com/quic-go/qtls-go1-20 v0.1.1 // indirect
212
+ github.com/quic-go/quic-go v0.33.0 // indirect
213
github.com/quic-go/webtransport-go v0.5.1 // indirect
214
github.com/raulk/go-watchdog v1.3.0 // indirect
215
github.com/rs/cors v1.7.0 // indirect
go.sum
+8
-10
@@ -760,8 +760,8 @@ github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xS
760
github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
761
github.com/libp2p/go-libp2p v0.8.1/go.mod h1:QRNH9pwdbEBpx5DTJYg+qxcVaDMAz3Ee/qDKwXujH5o=
762
github.com/libp2p/go-libp2p v0.14.3/go.mod h1:d12V4PdKbpL0T1/gsUNN8DfgMuRPDX8bS2QxCZlwRH0=
763
-github.com/libp2p/go-libp2p v0.25.1 h1:YK+YDCHpYyTvitKWVxa5PfElgIpOONU01X5UcLEwJGA=
764
-github.com/libp2p/go-libp2p v0.25.1/go.mod h1:xnK9/1d9+jeQCVvi/f1g12KqtVi/jP/SijtKV1hML3g=
763
+github.com/libp2p/go-libp2p v0.26.0 h1:0FE0bP9/G9YADjruqoFvf1snBBFvrdh1MmTuEeUkl2E=
764
+github.com/libp2p/go-libp2p v0.26.0/go.mod h1:R8N+XhwPDPLNb4TKboKJKnDeg9vPw8+zlC6g793dTGw=
765
github.com/libp2p/go-libp2p-asn-util v0.2.0 h1:rg3+Os8jbnO5DxkC7K/Utdi+DkY3q/d1/1q+8WeNAsw=
766
github.com/libp2p/go-libp2p-asn-util v0.2.0/go.mod h1:WoaWxbHKBymSN41hWSq/lGKJEca7TNm58+gGJi2WsLI=
767
github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3PtvYlJmg7NeVtPRqH8=
@@ -1221,14 +1221,12 @@ github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf
1221
github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ=
1222
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
1223
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
1224
-github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U=
1225
-github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc=
1226
-github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk=
1227
-github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
1228
-github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI=
1229
-github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
1230
-github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA=
1231
-github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo=
1224
+github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A=
1225
+github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
1226
+github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk=
1227
+github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
1228
+github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
1229
+github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
1230
github.com/quic-go/webtransport-go v0.5.1 h1:1eVb7WDWCRoaeTtFHpFBJ6WDN1bSrPrRoW6tZgSw0Ow=
1231
github.com/quic-go/webtransport-go v0.5.1/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
1232
github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM=
test/sharness/t0116-prometheus-data/prometheus_metrics
+83
@@ -576,6 +576,9 @@ leveldb_datastore_sync_latency_seconds_bucket
576
leveldb_datastore_sync_latency_seconds_count
577
leveldb_datastore_sync_latency_seconds_sum
578
leveldb_datastore_sync_total
579
+libp2p_autonat_next_probe_timestamp
580
+libp2p_autonat_reachability_status
581
+libp2p_autonat_reachability_status_confidence
582
libp2p_eventbus_events_emitted_total
583
libp2p_eventbus_events_emitted_total
584
libp2p_eventbus_subscriber_event_queued
@@ -593,8 +596,88 @@ libp2p_eventbus_subscribers_total
596
libp2p_eventbus_subscribers_total
597
libp2p_eventbus_subscribers_total
598
libp2p_eventbus_subscribers_total
599
+libp2p_identify_addrs_count
600
+libp2p_identify_addrs_received_bucket
601
+libp2p_identify_addrs_received_bucket
602
+libp2p_identify_addrs_received_bucket
603
+libp2p_identify_addrs_received_bucket
604
+libp2p_identify_addrs_received_bucket
605
+libp2p_identify_addrs_received_bucket
606
+libp2p_identify_addrs_received_bucket
607
+libp2p_identify_addrs_received_bucket
608
+libp2p_identify_addrs_received_bucket
609
+libp2p_identify_addrs_received_bucket
610
+libp2p_identify_addrs_received_bucket
611
+libp2p_identify_addrs_received_bucket
612
+libp2p_identify_addrs_received_bucket
613
+libp2p_identify_addrs_received_bucket
614
+libp2p_identify_addrs_received_bucket
615
+libp2p_identify_addrs_received_bucket
616
+libp2p_identify_addrs_received_bucket
617
+libp2p_identify_addrs_received_bucket
618
+libp2p_identify_addrs_received_bucket
619
+libp2p_identify_addrs_received_bucket
620
+libp2p_identify_addrs_received_bucket
621
+libp2p_identify_addrs_received_bucket
622
+libp2p_identify_addrs_received_bucket
623
+libp2p_identify_addrs_received_bucket
624
+libp2p_identify_addrs_received_bucket
625
+libp2p_identify_addrs_received_bucket
626
+libp2p_identify_addrs_received_bucket
627
+libp2p_identify_addrs_received_bucket
628
+libp2p_identify_addrs_received_bucket
629
+libp2p_identify_addrs_received_bucket
630
+libp2p_identify_addrs_received_bucket
631
+libp2p_identify_addrs_received_bucket
632
+libp2p_identify_addrs_received_bucket
633
+libp2p_identify_addrs_received_bucket
634
+libp2p_identify_addrs_received_bucket
635
+libp2p_identify_addrs_received_bucket
636
+libp2p_identify_addrs_received_bucket
637
+libp2p_identify_addrs_received_count
638
+libp2p_identify_addrs_received_sum
639
libp2p_identify_identify_pushes_triggered_total
640
libp2p_identify_identify_pushes_triggered_total
641
+libp2p_identify_protocols_count
642
+libp2p_identify_protocols_received_bucket
643
+libp2p_identify_protocols_received_bucket
644
+libp2p_identify_protocols_received_bucket
645
+libp2p_identify_protocols_received_bucket
646
+libp2p_identify_protocols_received_bucket
647
+libp2p_identify_protocols_received_bucket
648
+libp2p_identify_protocols_received_bucket
649
+libp2p_identify_protocols_received_bucket
650
+libp2p_identify_protocols_received_bucket
651
+libp2p_identify_protocols_received_bucket
652
+libp2p_identify_protocols_received_bucket
653
+libp2p_identify_protocols_received_bucket
654
+libp2p_identify_protocols_received_bucket
655
+libp2p_identify_protocols_received_bucket
656
+libp2p_identify_protocols_received_bucket
657
+libp2p_identify_protocols_received_bucket
658
+libp2p_identify_protocols_received_bucket
659
+libp2p_identify_protocols_received_bucket
660
+libp2p_identify_protocols_received_bucket
661
+libp2p_identify_protocols_received_bucket
662
+libp2p_identify_protocols_received_bucket
663
+libp2p_identify_protocols_received_bucket
664
+libp2p_identify_protocols_received_bucket
665
+libp2p_identify_protocols_received_bucket
666
+libp2p_identify_protocols_received_bucket
667
+libp2p_identify_protocols_received_bucket
668
+libp2p_identify_protocols_received_bucket
669
+libp2p_identify_protocols_received_bucket
670
+libp2p_identify_protocols_received_bucket
671
+libp2p_identify_protocols_received_bucket
672
+libp2p_identify_protocols_received_bucket
673
+libp2p_identify_protocols_received_bucket
674
+libp2p_identify_protocols_received_bucket
675
+libp2p_identify_protocols_received_bucket
676
+libp2p_identify_protocols_received_bucket
677
+libp2p_identify_protocols_received_bucket
678
+libp2p_identify_protocols_received_bucket
679
+libp2p_identify_protocols_received_count
680
+libp2p_identify_protocols_received_sum
681
process_cpu_seconds_total
682
process_max_fds
683
process_open_fds