Skip to content

Commit 80f9f34

Browse files
authored
Merge pull request ipfs#6353 from ipfs/feat/release-v0.4.21-rc1
release v0.4.21-rc1
2 parents 3c000c4 + 36e5e9a commit 80f9f34

File tree

4 files changed

+99
-50
lines changed

4 files changed

+99
-50
lines changed

core/node/groups.go

+5-7
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,11 @@ func LibP2P(bcfg *BuildCfg, cfg *config.Config) fx.Option {
7272
ps := fx.Options()
7373
if bcfg.getOpt("pubsub") || bcfg.getOpt("ipnsps") {
7474
var pubsubOptions []pubsub.Option
75-
if cfg.Pubsub.DisableSigning {
76-
pubsubOptions = append(pubsubOptions, pubsub.WithMessageSigning(false))
77-
}
78-
79-
if cfg.Pubsub.StrictSignatureVerification {
80-
pubsubOptions = append(pubsubOptions, pubsub.WithStrictSignatureVerification(true))
81-
}
75+
pubsubOptions = append(
76+
pubsubOptions,
77+
pubsub.WithMessageSigning(!cfg.Pubsub.DisableSigning),
78+
pubsub.WithStrictSignatureVerification(cfg.Pubsub.StrictSignatureVerification),
79+
)
8280

8381
switch cfg.Pubsub.Router {
8482
case "":

go.mod

+16-15
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/hashicorp/golang-lru v0.5.1
1818
github.com/hsanjuan/go-libp2p-http v0.0.2
1919
github.com/ipfs/dir-index-html v1.0.3
20-
github.com/ipfs/go-bitswap v0.0.4
20+
github.com/ipfs/go-bitswap v0.0.5
2121
github.com/ipfs/go-block-format v0.0.2
2222
github.com/ipfs/go-blockservice v0.0.3
2323
github.com/ipfs/go-cid v0.0.2
@@ -52,7 +52,7 @@ require (
5252
github.com/ipfs/go-metrics-prometheus v0.0.2
5353
github.com/ipfs/go-mfs v0.0.7
5454
github.com/ipfs/go-path v0.0.4
55-
github.com/ipfs/go-unixfs v0.0.5
55+
github.com/ipfs/go-unixfs v0.0.6
5656
github.com/ipfs/go-verifcid v0.0.1
5757
github.com/ipfs/hang-fds v0.0.1
5858
github.com/ipfs/interface-go-ipfs-core v0.0.8
@@ -76,10 +76,10 @@ require (
7676
github.com/libp2p/go-libp2p-metrics v0.0.1
7777
github.com/libp2p/go-libp2p-net v0.0.2
7878
github.com/libp2p/go-libp2p-peer v0.1.1
79-
github.com/libp2p/go-libp2p-peerstore v0.0.5
79+
github.com/libp2p/go-libp2p-peerstore v0.0.6
8080
github.com/libp2p/go-libp2p-pnet v0.0.1
8181
github.com/libp2p/go-libp2p-protocol v0.0.1
82-
github.com/libp2p/go-libp2p-pubsub v0.0.1
82+
github.com/libp2p/go-libp2p-pubsub v0.0.3
8383
github.com/libp2p/go-libp2p-pubsub-router v0.0.3
8484
github.com/libp2p/go-libp2p-quic-transport v0.0.3
8585
github.com/libp2p/go-libp2p-record v0.0.1
@@ -88,41 +88,42 @@ require (
8888
github.com/libp2p/go-libp2p-secio v0.0.3
8989
github.com/libp2p/go-libp2p-swarm v0.0.3
9090
github.com/libp2p/go-libp2p-tls v0.0.1
91-
github.com/libp2p/go-maddr-filter v0.0.1
91+
github.com/libp2p/go-maddr-filter v0.0.4
92+
github.com/libp2p/go-mplex v0.0.2 // indirect
9293
github.com/libp2p/go-stream-muxer v0.0.1
9394
github.com/libp2p/go-testutil v0.0.1
9495
github.com/mattn/go-isatty v0.0.7 // indirect
9596
github.com/mattn/go-runewidth v0.0.4 // indirect
9697
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
97-
github.com/miekg/dns v1.1.8 // indirect
98+
github.com/miekg/dns v1.1.10 // indirect
9899
github.com/mitchellh/go-homedir v1.1.0
99100
github.com/mr-tron/base58 v1.1.2
100101
github.com/multiformats/go-multiaddr v0.0.3
101102
github.com/multiformats/go-multiaddr-dns v0.0.2
102103
github.com/multiformats/go-multiaddr-net v0.0.1
103104
github.com/multiformats/go-multibase v0.0.1
104105
github.com/multiformats/go-multihash v0.0.5
105-
github.com/opentracing/opentracing-go v1.0.2
106+
github.com/multiformats/go-multistream v0.0.4 // indirect
107+
github.com/opentracing/opentracing-go v1.1.0
106108
github.com/pkg/errors v0.8.1
107-
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
108-
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
109-
github.com/prometheus/common v0.3.0 // indirect
110-
github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0 // indirect
109+
github.com/prometheus/client_golang v0.9.3
110+
github.com/prometheus/procfs v0.0.0-20190519111021-9935e8e0588d // indirect
111111
github.com/syndtr/goleveldb v1.0.0
112112
github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc
113113
github.com/whyrusleeping/go-smux-multiplex v3.0.16+incompatible
114114
github.com/whyrusleeping/go-smux-yamux v2.0.9+incompatible
115115
github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1
116116
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
117117
github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c
118-
go.uber.org/atomic v1.3.2 // indirect
118+
go.uber.org/atomic v1.4.0 // indirect
119119
go.uber.org/dig v1.7.0 // indirect
120120
go.uber.org/fx v1.9.0
121121
go.uber.org/goleak v0.10.0 // indirect
122122
go.uber.org/multierr v1.1.0 // indirect
123-
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 // indirect
124-
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
125-
golang.org/x/sys v0.0.0-20190426135247-a129542de9ae
123+
go4.org v0.0.0-20190313082347-94abd6928b1d // indirect
124+
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
125+
golang.org/x/net v0.0.0-20190514140710-3ec191127204 // indirect
126+
golang.org/x/sys v0.0.0-20190520161452-ad400b127469
126127
golang.org/x/text v0.3.2 // indirect
127128
gopkg.in/cheggaaa/pb.v1 v1.0.28
128129
gotest.tools/gotestsum v0.3.4

0 commit comments

Comments
 (0)