Skip to content

Commit a94d2fb

Browse files
bors[bot]peterargue
bors[bot]
and
peterargue
authored
Merge #1694
1694: Update libp2p-tls to fix issue with secured gRPC certificate r=peterargue a=peterargue Depends on #1692, which updates the min go version to 1.16. Updates required to pull in this change: libp2p/go-libp2p-tls#100 The `libp2p/go-libp2p-tls` PR updates the certificate generated by the `NewIdentity` method to include subject and issuer fields, making it compliant with the x509 Certificate standard ([RFC3280](https://datatracker.ietf.org/doc/html/rfc3280#section-4.1.2)). This involves updating various other libp2p libraries, which now require go version 1.16. Co-authored-by: Peter Argue <[email protected]>
2 parents c5ee8b7 + 3d3b9c4 commit a94d2fb

File tree

12 files changed

+357
-184
lines changed

12 files changed

+357
-184
lines changed

‎engine/execution/state_synchronization/state_diff_storer.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package state_synchronization
22

33
import (
44
"bytes"
5+
"context"
56
"fmt"
67
"io"
78

@@ -118,7 +119,8 @@ func (s *StateDiffStorer) readBlocks(cids []cid.Cid) (interface{}, error) {
118119
dec := s.codec.NewDecoder(comp)
119120
var code byte
120121
for i, c := range cids {
121-
block, err := s.blockWriter.bstore.Get(c)
122+
// TODO: cheating on this context since this code is unused and about to be completely refactored
123+
block, err := s.blockWriter.bstore.Get(context.Background(), c)
122124
if err != nil {
123125
return nil, fmt.Errorf("failed to get block %v from blockstore: %w", c, err)
124126
}
@@ -184,7 +186,8 @@ func (bw *BlockWriter) Flush() error {
184186

185187
func (bw *BlockWriter) writeBlock(data []byte) error {
186188
block := blocks.NewBlock(data)
187-
if err := bw.bstore.Put(block); err != nil {
189+
// TODO: cheating on this context since this code is unused and about to be completely refactored
190+
if err := bw.bstore.Put(context.Background(), block); err != nil {
188191
return fmt.Errorf("failed to put block %v into blockstore: %w", block.Cid(), err)
189192
}
190193
bw.cids = append(bw.cids, block.Cid())

‎go.mod

+28-23
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ require (
77
github.com/aws/aws-sdk-go-v2/config v1.8.0
88
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.5.1
99
github.com/aws/aws-sdk-go-v2/service/s3 v1.15.0
10+
github.com/benbjohnson/clock v1.3.0 // indirect
1011
github.com/bsipos/thist v1.0.0
11-
github.com/btcsuite/btcd v0.21.0-beta
12+
github.com/btcsuite/btcd v0.22.0-beta
1213
github.com/dapperlabs/testingdock v0.4.2
1314
github.com/davecgh/go-spew v1.1.1
1415
github.com/dgraph-io/badger/v2 v2.0.3
@@ -28,31 +29,32 @@ require (
2829
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-20200501113911-9a95f0fdbfea
2930
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
3031
github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0
32+
github.com/hashicorp/errwrap v1.1.0 // indirect
3133
github.com/hashicorp/go-multierror v1.1.1
3234
github.com/hashicorp/golang-lru v0.5.4
3335
github.com/improbable-eng/grpc-web v0.12.0
34-
github.com/ipfs/go-bitswap v0.4.0
36+
github.com/ipfs/go-bitswap v0.5.0
3537
github.com/ipfs/go-block-format v0.0.3
36-
github.com/ipfs/go-cid v0.0.7
37-
github.com/ipfs/go-datastore v0.4.5
38-
github.com/ipfs/go-ipfs-blockstore v0.1.6
39-
github.com/ipfs/go-ipfs-exchange-interface v0.0.1
38+
github.com/ipfs/go-cid v0.1.0
39+
github.com/ipfs/go-datastore v0.5.0
40+
github.com/ipfs/go-ipfs-blockstore v1.1.1
41+
github.com/ipfs/go-ipfs-exchange-interface v0.1.0
4042
github.com/ipfs/go-log v1.0.5
41-
github.com/ipld/go-ipld-prime v0.12.0 // indirect
43+
github.com/ipld/go-ipld-prime v0.14.1 // indirect
4244
github.com/jrick/bitset v1.0.0
43-
github.com/kr/text v0.2.0 // indirect
4445
github.com/libp2p/go-addr-util v0.1.0
45-
github.com/libp2p/go-libp2p v0.14.4
46-
github.com/libp2p/go-libp2p-core v0.8.6
47-
github.com/libp2p/go-libp2p-discovery v0.5.0
48-
github.com/libp2p/go-libp2p-kad-dht v0.13.0
49-
github.com/libp2p/go-libp2p-pubsub v0.4.1
50-
github.com/libp2p/go-libp2p-swarm v0.5.3
51-
github.com/libp2p/go-libp2p-tls v0.1.3
52-
github.com/libp2p/go-libp2p-transport-upgrader v0.4.6
53-
github.com/libp2p/go-tcp-transport v0.2.7
46+
github.com/libp2p/go-libp2p v0.16.0
47+
github.com/libp2p/go-libp2p-core v0.11.0
48+
github.com/libp2p/go-libp2p-discovery v0.6.0
49+
github.com/libp2p/go-libp2p-kad-dht v0.15.0
50+
github.com/libp2p/go-libp2p-pubsub v0.6.0
51+
github.com/libp2p/go-libp2p-swarm v0.8.0
52+
github.com/libp2p/go-libp2p-tls v0.3.1
53+
github.com/libp2p/go-libp2p-transport-upgrader v0.5.0
54+
github.com/libp2p/go-tcp-transport v0.4.0
5455
github.com/m4ksio/wal v1.0.0
55-
github.com/multiformats/go-multiaddr v0.3.3
56+
github.com/multiformats/go-base32 v0.0.4 // indirect
57+
github.com/multiformats/go-multiaddr v0.4.1
5658
github.com/multiformats/go-multiaddr-dns v0.3.1
5759
github.com/onflow/atree v0.1.0-beta1.0.20211027184039-559ee654ece9
5860
github.com/onflow/cadence v0.20.1
@@ -67,7 +69,7 @@ require (
6769
github.com/pelletier/go-toml v1.9.4 // indirect
6870
github.com/pierrec/lz4 v2.6.1+incompatible
6971
github.com/pkg/errors v0.9.1
70-
github.com/prometheus/client_golang v1.10.0
72+
github.com/prometheus/client_golang v1.11.0
7173
github.com/psiemens/sconfig v0.1.0 // indirect
7274
github.com/rs/zerolog v1.19.0
7375
github.com/schollz/progressbar/v3 v3.8.3
@@ -82,12 +84,14 @@ require (
8284
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
8385
github.com/vmihailenco/msgpack v4.0.4+incompatible
8486
github.com/vmihailenco/msgpack/v4 v4.3.11
85-
go.uber.org/atomic v1.7.0
86-
go.uber.org/multierr v1.6.0
87-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
87+
go.uber.org/atomic v1.9.0
88+
go.uber.org/multierr v1.7.0
89+
go.uber.org/zap v1.19.1 // indirect
90+
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
8891
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6
92+
golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
8993
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
90-
golang.org/x/text v0.3.7 // indirect
94+
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
9195
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
9296
google.golang.org/api v0.58.0
9397
google.golang.org/genproto v0.0.0-20211007155348-82e027067bd4
@@ -96,6 +100,7 @@ require (
96100
google.golang.org/protobuf v1.27.1
97101
gopkg.in/ini.v1 v1.63.0 // indirect
98102
gotest.tools v2.2.0+incompatible
103+
lukechampine.com/blake3 v1.1.7 // indirect
99104
pgregory.net/rapid v0.4.7
100105
)
101106

0 commit comments

Comments
 (0)