fix: notify wanted blocks from the client to the server

client/client.go

@@ -75,6 +75,19 @@ func WithTracer(tap tracer.Tracer) Option {
 	}
 }
 
+func WithBlockReceivedNotifier(brn BlockReceivedNotifier) Option {
+	return func(bs *Client) {
+		bs.blockReceivedNotifier = brn
+	}
+}
+
+type BlockReceivedNotifier interface {
+	// ReceivedBlocks notify the decision engine that a peer is well behaving
+	// and gave us usefull data, potentially increasing it's score and making us
+	// send them more data in exchange.
+	ReceivedBlocks(peer.ID, []blocks.Block)
+}
+
 // New initializes a BitSwap instance that communicates over the provided
 // BitSwapNetwork. This function registers the returned instance as the network
 // delegate. Runs until context is cancelled or bitswap.Close is called.
@@ -210,6 +223,8 @@ type Client struct {
 	// how often to rebroadcast providing requests to find more optimized providers
 	rebroadcastDelay delay.D
 
+	blockReceivedNotifier BlockReceivedNotifier
+
 	// whether we should actually simulate dont haves on request timeout
 	simulateDontHavesOnTimeout bool
 }
@@ -302,6 +317,10 @@ func (bs *Client) receiveBlocksFrom(ctx context.Context, from peer.ID, blks []bl
 	// Send all block keys (including duplicates) to any sessions that want them for accounting purpose.
 	bs.sm.ReceiveFrom(ctx, from, allKs, haves, dontHaves)
 
+	if bs.blockReceivedNotifier != nil {
+		bs.blockReceivedNotifier.ReceivedBlocks(from, wanted)
+	}
+
 	// Publish the block to any Bitswap clients that had requested blocks.
 	// (the sessions use this pubsub mechanism to inform clients of incoming
 	// blocks)

polyfill.go

@@ -76,9 +76,9 @@ func New(ctx context.Context, net network.BitSwapNetwork, bstore blockstore.Bloc
 	}
 
 	stats := metrics.New(ctx)
-	bs.Client = client.New(ctx, net, bstore, stats, clientOptions...)
 	bs.Server = server.New(ctx, net, bstore, stats, serverOptions...)
-	net.Start(bs) // use the polyfill receiver to log receive errors only once
+	bs.Client = client.New(ctx, net, bstore, stats, append(clientOptions, client.WithBlockReceivedNotifier(bs.Server))...)
+	net.Start(bs) // use the polyfill receiver to log received errors and trace messages only once
 
 	return bs
 }

server/server.go

@@ -508,6 +508,13 @@ func (bs *Server) ReceiveMessage(ctx context.Context, p peer.ID, incoming messag
 	}
 }
 
+// ReceivedBlocks notify the decision engine that a peer is well behaving
+// and gave us usefull data, potentially increasing it's score and making us
+// send them more data in exchange.
+func (bs *Server) ReceivedBlocks(from peer.ID, blks []blocks.Block) {
+	bs.engine.ReceivedBlocks(from, blks)
+}
+
 func (*Server) ReceiveError(err error) {
 	log.Infof("Bitswap Client ReceiveError: %s", err)
 	// TODO log the network error