@helia/bitswap 3.1.2 → 3.1.3-83e1f40d

package/dist/src/peer-want-lists/ledger.js

@@ -1,8 +1,10 @@
 import toBuffer from 'it-to-buffer';
-import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK } from '../constants.js';
-import { BlockPresenceType, WantType } from '../pb/message.js';
-import { QueuedBitswapMessage } from '../utils/bitswap-message.js';
-import { cidToPrefix } from '../utils/cid-prefix.js';
+import { CID } from 'multiformats/cid';
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
+import { DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK, DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW, DEFAULT_MAX_WANTLIST_SIZE } from "../constants.js";
+import { BlockPresenceType, WantType } from "../pb/message.js";
+import { QueuedBitswapMessage } from "../utils/bitswap-message.js";
+import { cidToPrefix } from "../utils/cid-prefix.js";
 export class Ledger {
     peerId;
     blockstore;
@@ -14,6 +16,8 @@ export class Ledger {
     lastExchange;
     maxSizeReplaceHasWithBlock;
     log;
+    doNotResendBlockWindow;
+    maxWantListSize;
     constructor(components, init) {
         this.peerId = components.peerId;
         this.blockstore = components.blockstore;
@@ -24,6 +28,8 @@ export class Ledger {
         this.bytesSent = 0;
         this.bytesReceived = 0;
         this.maxSizeReplaceHasWithBlock = init.maxSizeReplaceHasWithBlock ?? DEFAULT_MAX_SIZE_REPLACE_HAS_WITH_BLOCK;
+        this.doNotResendBlockWindow = init.doNotResendBlockWindow ?? DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW;
+        this.maxWantListSize = init.maxWantListSize ?? DEFAULT_MAX_WANTLIST_SIZE;
     }
     sentBytes(n) {
         this.exchangeCount++;
@@ -38,12 +44,141 @@ export class Ledger {
     debtRatio() {
         return (this.bytesSent / (this.bytesReceived + 1)); // +1 is to prevent division by zero
     }
+    removeExpiredWants() {
+        // remove any expired wants
+        this.wants.forEach((value, key) => {
+            if (value.expires != null && value.expires < Date.now()) {
+                this.wants.delete(key);
+            }
+        });
+    }
+    addWants(wantlist) {
+        if (wantlist == null) {
+            return;
+        }
+        // if the message has a full wantlist, remove all entries not currently
+        // being sent to the peer
+        if (wantlist.full === true) {
+            this.wants.forEach((value, key) => {
+                if (value.status === 'want') {
+                    this.wants.delete(key);
+                }
+            });
+        }
+        // clear cancelled wants and add new wants to the ledger
+        for (const entry of wantlist.entries) {
+            const cid = CID.decode(entry.cid);
+            const cidStr = uint8ArrayToString(cid.multihash.bytes, 'base64');
+            if (entry.cancel === true) {
+                this.log('peer %p cancelled want of block for %c', this.peerId, cid);
+                this.wants.delete(cidStr);
+            }
+            else {
+                if (entry.wantType === WantType.WantHave) {
+                    this.log('peer %p wanted block presence for %c', this.peerId, cid);
+                }
+                else {
+                    this.log('peer %p wanted block for %c', this.peerId, cid);
+                }
+                const existingWant = this.wants.get(cidStr);
+                // we are already tracking a want for this CID, just update the fields
+                if (existingWant != null) {
+                    const sentOrSending = existingWant.status === 'sent' || existingWant.status === 'sending';
+                    const wantTypeUpgrade = existingWant.wantType === WantType.WantHave && (entry.wantType == null || entry.wantType === WantType.WantBlock);
+                    // allow upgrade from WantHave to WantBlock if we've previously
+                    // sent or are sending a WantHave
+                    if (sentOrSending && wantTypeUpgrade) {
+                        existingWant.status = 'want';
+                    }
+                    existingWant.priority = entry.priority;
+                    existingWant.wantType = entry.wantType ?? WantType.WantBlock;
+                    existingWant.sendDontHave = entry.sendDontHave ?? false;
+                    continue;
+                }
+                // add a new want
+                this.wants.set(cidStr, {
+                    cid,
+                    priority: entry.priority,
+                    wantType: entry.wantType ?? WantType.WantBlock,
+                    sendDontHave: entry.sendDontHave ?? false,
+                    status: 'want',
+                    created: Date.now()
+                });
+            }
+        }
+        // if we have exceeded maxWantListSize, truncate the list - first select
+        // wants that are not currently being sent to the user
+        const wants = [...this.wants.entries()]
+            .filter(([key, entry]) => entry.status === 'want');
+        if (wants.length > this.maxWantListSize) {
+            this.truncateWants(wants);
+        }
+    }
+    truncateWants(wants) {
+        // sort wants by priority, lack of block presence, then age so the wants
+        // to be evicted are a older, low priority wants that we don't have the
+        // block for
+        wants = wants
+            .sort((a, b) => {
+            if (a[1].created < b[1].created) {
+                return -1;
+            }
+            if (b[1].created < a[1].created) {
+                return 1;
+            }
+            return 0;
+        })
+            .sort((a, b) => {
+            if (a[1].haveBlock === false) {
+                return -1;
+            }
+            if (b[1].haveBlock === false) {
+                return 1;
+            }
+            return 0;
+        })
+            .sort((a, b) => {
+            if (a[1].priority < b[1].priority) {
+                return -1;
+            }
+            if (b[1].priority < a[1].priority) {
+                return 1;
+            }
+            return 0;
+        });
+        const toRemove = wants.length - this.maxWantListSize;
+        for (let i = 0; i < toRemove; i++) {
+            this.wants.delete(wants[i][0]);
+        }
+    }
+    getWants() {
+        return [...this.wants.values()];
+    }
+    hasWant(cid) {
+        const cidStr = uint8ArrayToString(cid.multihash.bytes, 'base64');
+        return this.wants.has(cidStr);
+    }
     async sendBlocksToPeer(options) {
         const message = new QueuedBitswapMessage();
         const sentBlocks = new Set();
-        for (const [key, entry] of this.wants.entries()) {
+        // remove any expired wants
+        this.removeExpiredWants();
+        // pick unsent wants
+        const unsent = [...this.wants.entries()]
+            .filter(([key, value]) => value.status === 'want');
+        // update status, ensure we don't send the same blocks repeatedly
+        unsent.forEach(([key, value]) => {
+            value.status = 'sending';
+        });
+        for (const [key, entry] of unsent) {
             try {
                 const block = await toBuffer(this.blockstore.get(entry.cid, options));
+                // ensure we still need to send the block/status, status may have
+                // changed due to incoming message while we were waiting for async block
+                // load
+                if (entry.status !== 'sending') {
+                    continue;
+                }
                 // do they want the block or just us to tell them we have the block
                 if (entry.wantType === WantType.WantHave) {
                     if (block.byteLength < this.maxSizeReplaceHasWithBlock) {
@@ -73,11 +208,17 @@ export class Ledger {
                         prefix: cidToPrefix(entry.cid)
                     });
                 }
+                entry.status = 'sent';
+                entry.expires = Date.now() + this.doNotResendBlockWindow;
             }
             catch (err) {
                 if (err.name !== 'NotFoundError') {
                     throw err;
                 }
+                // reset status to try again later
+                entry.status = 'want';
+                // used to maybe delete this want later if the want list grows too large
+                entry.haveBlock = false;
                 this.log('do not have block for %c', entry.cid);
                 // we don't have the requested block and the remote is not interested
                 // in us telling them that
@@ -102,11 +243,6 @@ export class Ledger {
             this.log('sent message');
             // update accounting
             this.sentBytes([...message.blocks.values()].reduce((acc, curr) => acc + curr.data.byteLength, 0));
-            // remove sent blocks from local copy of their want list - they can still
-            // re-request if required
-            for (const key of sentBlocks) {
-                this.wants.delete(key);
-            }
         }
     }
 }

package/dist/src/peer-want-lists/ledger.js.map

@@ -1 +1 @@
-{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../../src/peer-want-lists/ledger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../../src/peer-want-lists/ledger.ts"],"names":[],"mappings":"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"}

package/dist/src/session.d.ts

@@ -1,7 +1,7 @@
 import { AbstractSession } from '@helia/utils';
-import type { BitswapWantProgressEvents } from './index.js';
-import type { Network } from './network.js';
-import type { WantList } from './want-list.js';
+import type { BitswapWantProgressEvents } from './index.ts';
+import type { Network } from './network.ts';
+import type { WantList } from './want-list.ts';
 import type { BlockRetrievalOptions, CreateSessionOptions } from '@helia/interface';
 import type { ComponentLogger, Libp2p, PeerId } from '@libp2p/interface';
 import type { Multiaddr } from '@multiformats/multiaddr';

package/dist/src/utils/bitswap-message.d.ts

@@ -1,4 +1,4 @@
-import type { Block, BlockPresence, WantlistEntry } from '../pb/message.js';
+import type { Block, BlockPresence, WantlistEntry } from '../pb/message.ts';
 import type { CID } from 'multiformats';
 /**
  * A bitswap message that is in the send queue. So implemented to be

package/dist/src/utils/cid-prefix.js

@@ -1,4 +1,4 @@
-import ve from './varint-encoder.js';
+import ve from "./varint-encoder.js";
 export function cidToPrefix(cid) {
     return ve([
         cid.version, cid.code, cid.multihash.code, cid.multihash.digest.byteLength

package/dist/src/utils/merge-messages.d.ts

@@ -1,3 +1,3 @@
-import type { QueuedBitswapMessage } from './bitswap-message.js';
+import type { QueuedBitswapMessage } from './bitswap-message.ts';
 export declare function mergeMessages(existingMessage: QueuedBitswapMessage, newMessage: QueuedBitswapMessage): QueuedBitswapMessage;
 //# sourceMappingURL=merge-messages.d.ts.map

package/dist/src/utils/split-message.d.ts

@@ -1,4 +1,4 @@
-import type { QueuedBitswapMessage } from './bitswap-message.js';
+import type { QueuedBitswapMessage } from './bitswap-message.ts';
 /**
  * https://github.com/ipfs/kubo/issues/4473#issuecomment-350390693
  */

package/dist/src/utils/split-message.js

@@ -1,6 +1,6 @@
 import { encodingLength } from 'uint8-varint';
-import { BlockTooLargeError } from '../errors.js';
-import { BitswapMessage, Block, BlockPresence, WantlistEntry } from '../pb/message.js';
+import { BlockTooLargeError } from "../errors.js";
+import { BitswapMessage, Block, BlockPresence, WantlistEntry } from "../pb/message.js";
 /**
  * https://github.com/ipfs/kubo/issues/4473#issuecomment-350390693
  */

package/dist/src/want-list.d.ts

@@ -1,8 +1,8 @@
 import { TypedEventEmitter } from '@libp2p/interface';
 import { CID } from 'multiformats/cid';
-import { WantType } from './pb/message.js';
-import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.js';
-import type { BitswapNetworkWantProgressEvents, Network } from './network.js';
+import { WantType } from './pb/message.ts';
+import type { BitswapNotifyProgressEvents, MultihashHasherLoader } from './index.ts';
+import type { BitswapNetworkWantProgressEvents, Network } from './network.ts';
 import type { ComponentLogger, PeerId, Startable, AbortOptions, Libp2p, TypedEventTarget, Metrics } from '@libp2p/interface';
 import type { PeerMap } from '@libp2p/peer-collections';
 import type { ProgressOptions } from 'progress-events';

package/dist/src/want-list.js

@@ -7,10 +7,10 @@ import pDefer from 'p-defer';
 import { raceEvent } from 'race-event';
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
-import { DEFAULT_MESSAGE_SEND_DELAY } from './constants.js';
-import { BlockPresenceType, WantType } from './pb/message.js';
-import { QueuedBitswapMessage } from './utils/bitswap-message.js';
-import vd from './utils/varint-decoder.js';
+import { DEFAULT_MESSAGE_SEND_DELAY } from "./constants.js";
+import { BlockPresenceType, WantType } from "./pb/message.js";
+import { QueuedBitswapMessage } from "./utils/bitswap-message.js";
+import vd from "./utils/varint-decoder.js";
 export class WantList extends TypedEventEmitter {
     /**
      * Tracks what CIDs we've previously sent to which peers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/bitswap",
-  "version": "3.1.2",
+  "version": "3.1.3-83e1f40d",
   "description": "JavaScript implementation of the Bitswap data exchange protocol used by Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/bitswap#readme",
@@ -51,8 +51,8 @@
     "docs": "aegir docs"
   },
   "dependencies": {
-    "@helia/interface": "^6.1.1",
-    "@helia/utils": "^2.4.2",
+    "@helia/interface": "6.1.1-83e1f40d",
+    "@helia/utils": "2.4.2-83e1f40d",
     "@libp2p/interface": "^3.1.0",
     "@libp2p/logger": "^6.0.5",
     "@libp2p/peer-collections": "^7.0.5",

package/src/bitswap.ts

@@ -1,12 +1,12 @@
 import { setMaxListeners } from '@libp2p/interface'
 import { anySignal } from 'any-signal'
 import { CustomProgressEvent } from 'progress-events'
-import { Network } from './network.js'
-import { PeerWantLists } from './peer-want-lists/index.js'
-import { createBitswapSession } from './session.js'
-import { Stats } from './stats.js'
-import { WantList } from './want-list.js'
-import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents } from './index.js'
+import { Network } from './network.ts'
+import { PeerWantLists } from './peer-want-lists/index.ts'
+import { createBitswapSession } from './session.ts'
+import { Stats } from './stats.ts'
+import { WantList } from './want-list.ts'
+import type { BitswapOptions, Bitswap as BitswapInterface, BitswapWantProgressEvents, BitswapNotifyProgressEvents, WantListEntry, BitswapComponents, PeerWantListEntry } from './index.ts'
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface'
 import type { ComponentLogger, Libp2p, PeerId, AbortOptions } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'
@@ -127,7 +127,7 @@ export class Bitswap implements BitswapInterface {
       }))
   }
 
-  getPeerWantlist (peer: PeerId): WantListEntry[] | undefined {
+  getPeerWantlist (peer: PeerId): PeerWantListEntry[] | undefined {
     return this.peerWantLists.wantListForPeer(peer)
   }
 

package/src/constants.ts

@@ -11,3 +11,5 @@ export const DEFAULT_SESSION_ROOT_PRIORITY = 1
 export const DEFAULT_MAX_PROVIDERS_PER_REQUEST = 3
 export const DEFAULT_MAX_OUTGOING_MESSAGE_SIZE = 1024 * 1024 * 4
 export const DEFAULT_MAX_INCOMING_MESSAGE_SIZE = DEFAULT_MAX_OUTGOING_MESSAGE_SIZE
+export const DEFAULT_DO_NOT_RESEND_BLOCK_WINDOW = 1_000 * 5
+export const DEFAULT_MAX_WANTLIST_SIZE = 1024

package/src/index.ts

@@ -6,9 +6,9 @@
  * It supersedes the older [ipfs-bitswap](https://www.npmjs.com/package/ipfs-bitswap) module with the aim of being smaller, faster, better integrated with libp2p/helia, having fewer dependencies and using standard JavaScript instead of Node.js APIs.
  */
 
-import { Bitswap as BitswapClass } from './bitswap.js'
-import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.js'
-import type { WantType } from './pb/message.js'
+import { Bitswap as BitswapClass } from './bitswap.ts'
+import type { BitswapNetworkNotifyProgressEvents, BitswapNetworkWantProgressEvents, BitswapNetworkProgressEvents } from './network.ts'
+import type { WantType } from './pb/message.ts'
 import type { CreateSessionOptions, ProviderOptions, SessionBlockBroker } from '@helia/interface'
 import type { Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Startable, ComponentLogger, Metrics, PeerId } from '@libp2p/interface'
@@ -35,12 +35,18 @@ export type { BitswapNetworkProgressEvents }
 export type { WantType }
 export type { BitswapProvider } from './network.ts'
 
+export type WantStatus = 'want' | 'sending' | 'sent'
+
 export interface WantListEntry {
   cid: CID
   priority: number
   wantType: WantType
 }
 
+export interface PeerWantListEntry extends WantListEntry {
+  status: WantStatus
+}
+
 export interface Bitswap extends Startable {
   /**
    * Returns the current state of the wantlist
@@ -51,7 +57,7 @@ export interface Bitswap extends Startable {
    * Returns the current state of the wantlist for a peer, if it is being
    * tracked
    */
-  getPeerWantlist(peerId: PeerId): WantListEntry[] | undefined
+  getPeerWantlist(peerId: PeerId): PeerWantListEntry[] | undefined
 
   /**
    * Notify bitswap that a new block is available
@@ -188,6 +194,21 @@ export interface BitswapOptions {
    * @default 2097152
    */
   maxIncomingMessageSize?: number
+
+  /**
+   * If a block has been sent to a peer and it is requested again by the same
+   * peer, do not send it again until this many ms have elapsed
+   *
+   * @default 5000
+   */
+  doNotResendBlockWindow?: number
+
+  /**
+   * Restrict the local copy of each peer wantlist to this many entries
+   *
+   * @default 1024
+   */
+  maxWantlistSize?: number
 }
 
 export const createBitswap = (components: BitswapComponents, options: BitswapOptions = {}): Bitswap => {

package/src/network.ts

@@ -7,14 +7,14 @@ import { pushable } from 'it-pushable'
 import take from 'it-take'
 import { CustomProgressEvent } from 'progress-events'
 import { raceEvent } from 'race-event'
-import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from './constants.js'
-import { BitswapMessage } from './pb/message.js'
-import { mergeMessages } from './utils/merge-messages.js'
-import { splitMessage } from './utils/split-message.js'
-import type { WantOptions } from './bitswap.js'
-import type { MultihashHasherLoader } from './index.js'
-import type { Block } from './pb/message.js'
-import type { QueuedBitswapMessage } from './utils/bitswap-message.js'
+import { BITSWAP_120, DEFAULT_MAX_INBOUND_STREAMS, DEFAULT_MAX_INCOMING_MESSAGE_SIZE, DEFAULT_MAX_OUTBOUND_STREAMS, DEFAULT_MAX_OUTGOING_MESSAGE_SIZE, DEFAULT_MAX_PROVIDERS_PER_REQUEST, DEFAULT_MESSAGE_RECEIVE_TIMEOUT, DEFAULT_MESSAGE_SEND_CONCURRENCY, DEFAULT_RUN_ON_TRANSIENT_CONNECTIONS } from './constants.ts'
+import { BitswapMessage } from './pb/message.ts'
+import { mergeMessages } from './utils/merge-messages.ts'
+import { splitMessage } from './utils/split-message.ts'
+import type { WantOptions } from './bitswap.ts'
+import type { MultihashHasherLoader } from './index.ts'
+import type { Block } from './pb/message.ts'
+import type { QueuedBitswapMessage } from './utils/bitswap-message.ts'
 import type { Provider, Routing } from '@helia/interface/routing'
 import type { Libp2p, AbortOptions, Connection, PeerId, Topology, ComponentLogger, IdentifyResult, Counter, Metrics, Stream } from '@libp2p/interface'
 import type { Logger } from '@libp2p/logger'

package/src/peer-want-lists/index.ts

@@ -1,11 +1,9 @@
 import { trackedPeerMap } from '@libp2p/peer-collections'
 import { CID } from 'multiformats/cid'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { WantType } from '../pb/message.js'
-import { Ledger } from './ledger.js'
-import type { BitswapNotifyProgressEvents, WantListEntry } from '../index.js'
-import type { Network } from '../network.js'
-import type { BitswapMessage } from '../pb/message.js'
+import { Ledger } from './ledger.ts'
+import type { BitswapNotifyProgressEvents, PeerWantListEntry } from '../index.ts'
+import type { Network } from '../network.ts'
+import type { BitswapMessage } from '../pb/message.ts'
 import type { AbortOptions, ComponentLogger, Libp2p, Logger, Metrics, PeerId } from '@libp2p/interface'
 import type { PeerMap } from '@libp2p/peer-collections'
 import type { Blockstore } from 'interface-blockstore'
@@ -13,6 +11,8 @@ import type { ProgressOptions } from 'progress-events'
 
 export interface PeerWantListsInit {
   maxSizeReplaceHasWithBlock?: number
+  doNotResendBlockWindow?: number
+  maxWantListSize?: number
 }
 
 export interface PeerWantListsComponents {
@@ -36,6 +36,8 @@ export class PeerWantLists {
   public network: Network
   public readonly ledgerMap: PeerMap<Ledger>
   private readonly maxSizeReplaceHasWithBlock?: number
+  private readonly doNotResendBlockWindow?: number
+  private readonly maxWantListSize?: number
   private readonly log: Logger
   private readonly logger: ComponentLogger
 
@@ -43,6 +45,8 @@ export class PeerWantLists {
     this.blockstore = components.blockstore
     this.network = components.network
     this.maxSizeReplaceHasWithBlock = init.maxSizeReplaceHasWithBlock
+    this.doNotResendBlockWindow = init.doNotResendBlockWindow
+    this.maxWantListSize = init.maxWantListSize
     this.log = components.logger.forComponent('helia:bitswap:peer-want-lists')
     this.logger = components.logger
 
@@ -78,14 +82,17 @@ export class PeerWantLists {
     }
   }
 
-  wantListForPeer (peerId: PeerId): WantListEntry[] | undefined {
+  wantListForPeer (peerId: PeerId): PeerWantListEntry[] | undefined {
     const ledger = this.ledgerMap.get(peerId)
 
     if (ledger == null) {
       return undefined
     }
 
-    return [...ledger.wants.values()]
+    // remove any expired wants
+    ledger.removeExpiredWants()
+
+    return ledger.getWants()
   }
 
   peers (): PeerId[] {
@@ -105,7 +112,9 @@ export class PeerWantLists {
         network: this.network,
         logger: this.logger
       }, {
-        maxSizeReplaceHasWithBlock: this.maxSizeReplaceHasWithBlock
+        maxSizeReplaceHasWithBlock: this.maxSizeReplaceHasWithBlock,
+        doNotResendBlockWindow: this.doNotResendBlockWindow,
+        maxWantListSize: this.maxWantListSize
       })
       this.ledgerMap.set(peerId, ledger)
     }
@@ -113,47 +122,21 @@ export class PeerWantLists {
     // record the amount of block data received
     ledger.receivedBytes(message.blocks?.reduce((acc, curr) => acc + curr.data.byteLength, 0) ?? 0)
 
-    if (message.wantlist != null) {
-      // if the message has a full wantlist, clear the current wantlist
-      if (message.wantlist.full === true) {
-        ledger.wants.clear()
-      }
+    // remove any expired wants
+    ledger.removeExpiredWants()
 
-      // clear cancelled wants and add new wants to the ledger
-      for (const entry of message.wantlist.entries) {
-        const cid = CID.decode(entry.cid)
-        const cidStr = uint8ArrayToString(cid.multihash.bytes, 'base64')
-
-        if (entry.cancel === true) {
-          this.log('peer %p cancelled want of block for %c', peerId, cid)
-          ledger.wants.delete(cidStr)
-        } else {
-          if (entry.wantType === WantType.WantHave) {
-            this.log('peer %p wanted block presence for %c', peerId, cid)
-          } else {
-            this.log('peer %p wanted block for %c', peerId, cid)
-          }
-
-          ledger.wants.set(cidStr, {
-            cid,
-            priority: entry.priority,
-            wantType: entry.wantType ?? WantType.WantBlock,
-            sendDontHave: entry.sendDontHave ?? false
-          })
-        }
-      }
-    }
+    // add new wants
+    ledger.addWants(message.wantlist)
 
     this.log('send blocks to peer')
     await ledger.sendBlocksToPeer()
   }
 
   async receivedBlock (cid: CID, options: ProgressOptions<BitswapNotifyProgressEvents> & AbortOptions): Promise<void> {
-    const cidStr = uint8ArrayToString(cid.multihash.bytes, 'base64')
     const ledgers: Ledger[] = []
 
     for (const ledger of this.ledgerMap.values()) {
-      if (ledger.wants.has(cidStr)) {
+      if (ledger.hasWant(cid)) {
         ledgers.push(ledger)
       }
     }