fix: fix duplicate block issue in bitswap

1. Increase broadcast timeout.
2. Fix use of sessions when pinning.

This also includes some bitswap changes to reduce some memory allocations and
optimize some hot spots.

Author: Stebalien

core/node/core.go

@@ -65,6 +65,11 @@ func Pinning(bstore blockstore.Blockstore, ds format.DAGService, repo repo.Repo)
 	return pinning, nil
 }
 
+var (
+	_ merkledag.SessionMaker = new(syncDagService)
+	_ format.DAGService      = new(syncDagService)
+)
+
 // syncDagService is used by the Pinner to ensure data gets persisted to the underlying datastore
 type syncDagService struct {
 	format.DAGService
@@ -75,6 +80,10 @@ func (s *syncDagService) Sync() error {
 	return s.syncFn()
 }
 
+func (s *syncDagService) Session(ctx context.Context) format.NodeGetter {
+	return merkledag.NewSession(ctx, s.DAGService)
+}
+
 // Dag creates new DAGService
 func Dag(bs blockservice.BlockService) format.DAGService {
 	return merkledag.NewDAGService(bs)

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/gogo/protobuf v1.3.1
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/ipfs/go-bitswap v0.2.11
+	github.com/ipfs/go-bitswap v0.2.12
 	github.com/ipfs/go-block-format v0.0.2
 	github.com/ipfs/go-blockservice v0.1.3
 	github.com/ipfs/go-cid v0.0.5
@@ -46,7 +46,7 @@ require (
 	github.com/ipfs/go-ipld-git v0.0.3
 	github.com/ipfs/go-ipns v0.0.2
 	github.com/ipfs/go-log v1.0.4
-	github.com/ipfs/go-merkledag v0.3.1
+	github.com/ipfs/go-merkledag v0.3.2
 	github.com/ipfs/go-metrics-interface v0.0.1
 	github.com/ipfs/go-metrics-prometheus v0.0.2
 	github.com/ipfs/go-mfs v0.1.1
@@ -107,3 +107,5 @@ require (
 )
 
 go 1.13
+
+replace github.com/ipfs/go-bitswap => /home/steb/.local/share/go/src/github.com/ipfs/go-bitswap