hypercore 10.0.0-alpha.23 → 10.0.0-alpha.26

package/lib/replicator.js

@@ -1,832 +1,1459 @@
-const Protocol = require('./protocol')
-const RemoteBitfield = require('./remote-bitfield')
-const RandomIterator = require('random-array-iterator')
 const b4a = require('b4a')
+const safetyCatch = require('safety-catch')
+const RandomIterator = require('random-array-iterator')
+const RemoteBitfield = require('./remote-bitfield')
+const m = require('./messages')
+const caps = require('./caps')
+
+const DEFAULT_MAX_INFLIGHT = 32
+
+class Attachable {
+  constructor () {
+    this.resolved = false
+    this.refs = []
+  }
+
+  attach (session) {
+    const r = {
+      context: this,
+      session,
+      sindex: 0,
+      rindex: 0,
+      resolve: null,
+      reject: null,
+      promise: null
+    }
 
-const PKG = require('../package.json')
-const USER_AGENT = PKG.name + '/' + PKG.version + '@nodejs'
+    r.sindex = session.push(r) - 1
+    r.rindex = this.refs.push(r) - 1
+    r.promise = new Promise((resolve, reject) => {
+      r.resolve = resolve
+      r.reject = reject
+    })
 
-class RemoteState {
-  constructor (core) {
-    this.receivedInfo = false
-    this.inflight = 0
-    this.maxInflight = 16
-    this.bitfield = new RemoteBitfield()
-    this.length = 0
-    this.fork = 0
+    return r
   }
-}
 
-class InvertedPromise {
-  constructor (resolve, reject, index) {
-    this.index = index
-    this.resolve = resolve
-    this.reject = reject
+  detach (r) {
+    if (r.context !== this) return false
+
+    this._detach(r)
+    this._cancel(r)
+    this.gc()
+
+    return true
   }
-}
 
-class Request {
-  constructor (index, seek, nodes) {
-    this.peer = null
-    this.index = index
-    this.seek = seek
-    this.value = seek === 0
-    this.nodes = nodes
-    this.promises = []
+  _detach (r) {
+    const rh = this.refs.pop()
+    const sh = r.session.pop()
+
+    if (r.rindex < this.refs.length - 1) this.refs[rh.rindex = r.rindex] = rh
+    if (r.sindex < r.session.length - 1) r.session[sh.sindex = r.sindex] = sh
+
+    r.context = null
+
+    return r
   }
 
-  createPromise () {
-    return new Promise((resolve, reject) => {
-      this.promises.push(new InvertedPromise(resolve, reject, this.promises.length))
-    })
+  gc () {
+    if (this.refs.length === 0) this._unref()
+  }
+
+  _cancel (r) {
+    r.reject(new Error('Request cancelled'))
+  }
+
+  _unref () {
+    // overwrite me
   }
 
   resolve (val) {
-    for (let i = 0; i < this.promises.length; i++) {
-      this.promises[i].resolve(val)
+    this.resolved = true
+    while (this.refs.length > 0) {
+      this._detach(this.refs[this.refs.length - 1]).resolve(val)
     }
   }
 
   reject (err) {
-    for (let i = 0; i < this.promises.length; i++) {
-      this.promises[i].reject(err)
+    this.resolved = true
+    while (this.refs.length > 0) {
+      this._detach(this.refs[this.refs.length - 1]).reject(err)
     }
   }
 }
 
-class Upgrade {
-  constructor (minLength) {
-    this.minLength = minLength
-    this.promises = []
-  }
+class BlockRequest extends Attachable {
+  constructor (tracker, fork, index) {
+    super()
 
-  update (peers, fork) {
-    for (const peer of peers) {
-      if (peer.state.length >= this.minLength && !paused(peer, fork)) return true
-      if (!peer.state.receivedInfo) return true
-    }
+    this.fork = fork
+    this.index = index
+    this.inflight = []
+    this.queued = false
+    this.tracker = tracker
+  }
 
-    return false
+  _unref () {
+    if (this.inflight.length > 0) return
+    this.tracker.remove(this.fork, this.index)
   }
+}
 
-  createPromise () {
-    return new Promise((resolve, reject) => {
-      this.promises.push(new InvertedPromise(resolve, reject, this.promises.length))
-    })
+class RangeRequest extends Attachable {
+  constructor (ranges, fork, start, end, linear, blocks) {
+    super()
+
+    this.fork = fork
+    this.start = start
+    this.end = end
+    this.linear = linear
+    this.blocks = blocks
+    this.ranges = ranges
+
+    // As passed by the user, immut
+    this.userStart = start
+    this.userEnd = end
   }
 
-  resolve (val) {
-    for (let i = 0; i < this.promises.length; i++) {
-      this.promises[i].resolve(val)
-    }
+  _unref () {
+    const i = this.ranges.indexOf(this)
+    if (i === -1) return
+    const h = this.ranges.pop()
+    if (i < this.ranges.length - 1) this.ranges[i] = h
   }
 
-  reject (err) {
-    for (let i = 0; i < this.promises.length; i++) {
-      this.promises[i].reject(err)
-    }
+  _cancel (r) {
+    r.resolve(false)
   }
 }
 
-class UpgradeLock {
-  constructor (peer, length) {
-    this.peer = peer
+class UpgradeRequest extends Attachable {
+  constructor (replicator, fork, length) {
+    super()
+
+    this.fork = fork
     this.length = length
-    this.resolve = null
-    this.promise = new Promise((resolve) => { this.resolve = resolve })
+    this.inflight = []
+    this.replicator = replicator
+  }
+
+  _unref () {
+    if (this.replicator.eagerUpgrade === true || this.inflight.length > 0) return
+    this.replicator._upgrade = null
+  }
+
+  _cancel (r) {
+    r.resolve(false)
   }
 }
 
-class Seek {
-  constructor (seeker) {
-    this.request = null
+class SeekRequest extends Attachable {
+  constructor (seeks, fork, seeker) {
+    super()
+
+    this.fork = fork
     this.seeker = seeker
-    this.promise = null
-    this.finished = false
+    this.inflight = []
+    this.seeks = seeks
   }
 
-  async update () {
-    const res = await this.seeker.update()
-    if (!res) return false
-    this.finished = true
-    this.promise.resolve(res)
-    return true
+  _unref () {
+    if (this.inflight.length > 0) return
+    const i = this.seeks.indexOf(this)
+    if (i === -1) return
+    const h = this.seeks.pop()
+    if (i < this.seeks.length - 1) this.seeks[i] = h
   }
+}
 
-  createPromise () {
-    return new Promise((resolve, reject) => {
-      this.promise = new InvertedPromise(resolve, reject, 0)
-    })
+class InflightTracker {
+  constructor () {
+    this._requests = []
+    this._free = []
   }
-}
 
-class Range {
-  constructor (start, end, filter, linear) {
-    this.start = start
-    this.end = end
-    this.filter = filter
-    this.linear = !!linear
-    this.promise = null
-    this.done = false
+  * [Symbol.iterator] () {
+    for (const req of this._requests) {
+      if (req !== null) yield req
+    }
+  }
 
-    this._inv = null
-    this._start = start // can be updated
-    this._ranges = null // set be replicator
-    this._resolved = false
-    this._error = null
+  add (req) {
+    const id = this._free.length ? this._free.pop() : this._requests.push(null)
+
+    req.id = id
+    this._requests[id - 1] = req
+    return req
   }
 
-  contains (req) {
-    return this._start <= req.index && req.index < this.end
+  get (id) {
+    return id <= this._requests.length ? this._requests[id - 1] : null
   }
 
-  update (bitfield) {
-    if (this.end === -1) {
-      while (bitfield.get(this._start)) this._start++
-      return false
+  remove (id) {
+    if (id <= this._requests.length) {
+      this._requests[id - 1] = null
+      this._free.push(id)
     }
+  }
+}
 
-    for (; this._start < this.end; this._start++) {
-      if (this.filter(this._start) && !bitfield.get(this._start)) return false
-    }
+class BlockTracker {
+  constructor (core) {
+    this._core = core
+    this._fork = core.tree.fork
 
-    return true
+    this._indexed = new Map()
+    this._additional = []
   }
 
-  resolve (done) {
-    this._done(null, done)
+  * [Symbol.iterator] () {
+    yield * this._indexed.values()
+    yield * this._additional
   }
 
-  destroy (err) {
-    this._done(err, false)
+  has (fork, index) {
+    return this.get(fork, index) !== null
   }
 
-  downloaded () {
-    if (this.promise) return this.promise
-    if (!this.done) return this._makePromise()
-    if (this._error !== null) return Promise.reject(this._error)
-    return Promise.resolve(this._resolved)
+  get (fork, index) {
+    if (this._fork === fork) return this._indexed.get(index) || null
+    for (const b of this._additional) {
+      if (b.index === index && b.fork === fork) return b
+    }
+    return null
   }
 
-  _done (err, done) {
-    if (this.done) return
-    this.done = true
+  add (fork, index) {
+    // TODO: just rely on someone calling .update(fork) instead
+    if (this._fork !== this._core.tree.fork) this.update(this._core.tree.fork)
 
-    if (this._ranges) {
-      const i = this._ranges.indexOf(this)
+    let b = this.get(fork, index)
+    if (b) return b
 
-      if (i === this._ranges.length - 1) this._ranges.pop()
-      else if (i > -1) this._ranges[i] = this._ranges.pop()
+    b = new BlockRequest(this, fork, index)
+
+    if (fork === this._fork) this._indexed.set(index, b)
+    else this._additional.push(b)
+
+    return b
+  }
+
+  remove (fork, index) {
+    if (this._fork === fork) {
+      const b = this._indexed.get(index)
+      this._indexed.delete(index)
+      return b || null
     }
 
-    this._ranges = null
-    this._resolved = done
-    this._error = err
+    for (let i = 0; i < this._additional.length; i++) {
+      const b = this._additional[i]
+      if (b.index !== index || b.fork !== fork) continue
+      if (i === this._additional.length - 1) this._additional.pop()
+      else this._additional[i] = this._additional.pop()
+      return b
+    }
 
-    if (this._inv === null) return
-    if (err) this._inv.reject(err)
-    else this._inv.resolve(done)
+    return null
   }
 
-  _makePromise () {
-    this.promise = new Promise((resolve, reject) => {
-      this._inv = new InvertedPromise(resolve, reject, 0)
-    })
+  update (fork) {
+    if (this._fork === fork) return
+
+    const additional = this._additional
+    this._additional = []
 
-    return this.promise
+    for (const b of this._indexed.values()) {
+      // TODO: this is only needed cause we hot patch the fork ids below, revert that later
+      if (b.fork !== this._fork) additional.push(b)
+      else this._additional.push(b)
+    }
+    this._indexed.clear()
+
+    for (const b of additional) {
+      if (b.fork === fork) this._indexed.set(b.index, b)
+      else this._additional.push(b)
+    }
+
+    this._fork = fork
   }
 }
 
-class RequestPool {
-  constructor (replicator, core) {
+class Peer {
+  constructor (replicator, protomux, channel) {
+    this.core = replicator.core
     this.replicator = replicator
-    this.core = core
-    this.pending = []
-    this.seeks = []
-    this.ranges = []
-    this.requests = new Map()
-    this.upgrading = null
-    this.unforking = null
-    this.eagerUpgrades = true
-    this.paused = false
-  }
-
-  // We could make this faster by using some memory of each peer to store what they are involved in,
-  // but that might not be worth the cost/complexity.
-  clear (peer) {
-    peer.state.inflight = 0
-
-    for (const seek of this.seeks) {
-      if (seek.request && seek.request.peer === peer) {
-        // TODO: should prob remove cancel this request all together if no one else wants it
-        // and nothing is inflight
-        seek.request = null
-      }
-    }
-    for (const req of this.requests.values()) {
-      if (req.peer === peer) {
-        req.peer = null
-        this.pending.push(req)
-      }
-    }
-    if (this.upgrading && this.upgrading.peer === peer) {
-      this.upgrading.resolve()
-      this.upgrading = null
-    }
+    this.stream = protomux.stream
+    this.protomux = protomux
+
+    this.channel = channel
+    this.channel.userData = this
+
+    this.wireSync = this.channel.messages[0]
+    this.wireRequest = this.channel.messages[1]
+    this.wireCancel = null
+    this.wireData = this.channel.messages[3]
+    this.wireNoData = this.channel.messages[4]
+    this.wireWant = this.channel.messages[5]
+    this.wireUnwant = this.channel.messages[6]
+    this.wireBitfield = this.channel.messages[7]
+    this.wireRange = this.channel.messages[8]
+    this.wireExtension = this.channel.messages[9]
+
+    this.inflight = 0
+    this.maxInflight = DEFAULT_MAX_INFLIGHT
+
+    this.canUpgrade = true
+
+    this.needsSync = false
+    this.syncsProcessing = 0
+
+    // TODO: tweak pipelining so that data sent BEFORE remoteOpened is not cap verified!
+    // we might wanna tweak that with some crypto, ie use the cap to encrypt it...
+    // or just be aware of that, to only push non leaky data
+
+    this.remoteOpened = false
+    this.remoteBitfield = new RemoteBitfield()
+
+    this.remoteFork = 0
+    this.remoteLength = 0
+    this.remoteCanUpgrade = false
+    this.remoteUploading = true
+    this.remoteDownloading = true
+    this.remoteSynced = false
+
+    this.lengthAcked = 0
+
+    this.extensions = new Map()
+    this.lastExtensionSent = ''
+    this.lastExtensionRecv = ''
+
+    replicator._ifAvailable++
   }
 
-  isRequesting (index) {
-    return this.requests.has(index)
+  signalUpgrade () {
+    if (this._shouldUpdateCanUpgrade() === true) this._updateCanUpgradeAndSync()
+    else this.sendSync()
   }
 
-  update (peer) {
-    if (peer.state.inflight >= peer.state.maxInflight) return false
-    if (this.paused) return false
+  broadcastRange (start, length, drop) {
+    this.wireRange.send({
+      drop,
+      start,
+      length
+    })
+  }
 
-    if (peer.state.fork > this.core.tree.fork) {
-      // we message them in the info recv
-      return true
-    }
+  extension (name, message) {
+    this.wireExtension.send({ name: name === this.lastExtensionSent ? '' : name, message })
+    this.lastExtensionSent = name
+  }
 
-    // technically we'd like to run seeks at the same custom prio as reqs
-    // but this is a lot simpler and they should run asap anyway as they
-    // are super low cost (hash only request)
-    for (const seek of this.seeks) {
-      if (this._updateSeek(peer, seek)) return true
-    }
+  onextension (message) {
+    const name = message.name || this.lastExtensionRecv
+    this.lastExtensionRecv = name
+    const ext = this.extensions.get(name)
+    if (ext) ext._onmessage({ start: 0, end: message.byteLength, buffer: message.message }, this)
+  }
 
-    if (this.pendingUpgrade) {
-      if (this._updateUpgrade(peer)) return true
+  sendSync () {
+    if (this.syncsProcessing !== 0) {
+      this.needsSync = true
+      return
     }
 
-    const pending = new RandomIterator(this.pending) // can be cached
-    for (const req of pending) {
-      if (this._updatePeer(peer, req)) {
-        pending.dequeue()
-        return true
-      }
+    if (this.core.tree.fork !== this.remoteFork) {
+      this.canUpgrade = false
     }
 
-    const ranges = new RandomIterator(this.ranges) // can be cached
-    for (const range of ranges) {
-      if (this._updateRange(peer, range)) return true
+    this.needsSync = false
+
+    this.wireSync.send({
+      fork: this.core.tree.fork,
+      length: this.core.tree.length,
+      remoteLength: this.core.tree.fork === this.remoteFork ? this.remoteLength : 0,
+      canUpgrade: this.canUpgrade,
+      uploading: true,
+      downloading: true
+    })
+  }
+
+  onopen ({ capability }) {
+    const expected = caps.replicate(this.stream.isInitiator === false, this.replicator.key, this.stream.handshakeHash)
+
+    if (b4a.equals(capability, expected) !== true) { // TODO: change this to a rejection instead, less leakage
+      throw new Error('Remote sent an invalid capability')
     }
 
-    if (this.eagerUpgrades && !this.upgrading) {
-      return this._updateUpgrade(peer)
+    if (this.remoteOpened === true) return
+    this.remoteOpened = true
+
+    this.protomux.cork()
+
+    this.sendSync()
+
+    const p = pages(this.core)
+
+    for (let index = 0; index < p.length; index++) {
+      this.wireBitfield.send({
+        start: index * this.core.bitfield.pageSize,
+        bitfield: p[index]
+      })
     }
 
-    return false
+    this.replicator._ifAvailable--
+    this.replicator._addPeer(this)
+
+    this.protomux.uncork()
   }
 
-  _updateSeek (peer, seek) {
-    if (seek.request) return false
-    // We have to snapshot the nodes here now, due to the caching of the request...
-    const nodes = log2(seek.seeker.end - seek.seeker.start)
-    seek.request = this._requestRange(peer, seek.seeker.start, seek.seeker.end, seek.seeker.bytes, nodes)
-    return seek.request !== null
+  onclose (isRemote) {
+    if (this.remoteOpened === false) {
+      this.replicator._ifAvailable--
+      this.replicator.updateAll()
+      return
+    }
+
+    this.remoteOpened = false
+    this.replicator._removePeer(this)
   }
 
-  _updatePeer (peer, req) {
-    const remote = peer.state.bitfield
-    const local = this.core.bitfield
+  async onsync ({ fork, length, remoteLength, canUpgrade, uploading, downloading }) {
+    const lengthChanged = length !== this.remoteLength
+    const sameFork = (fork === this.core.tree.fork)
 
-    if (!remote.get(req.index) || local.get(req.index)) return false
+    this.remoteSynced = true
+    this.remoteFork = fork
+    this.remoteLength = length
+    this.remoteCanUpgrade = canUpgrade
+    this.remoteUploading = uploading
+    this.remoteDownloading = downloading
 
-    this.send(peer, req)
-    return true
-  }
+    this.lengthAcked = sameFork ? remoteLength : 0
+    this.syncsProcessing++
 
-  _updateRange (peer, range) {
-    const end = range.end === -1 ? peer.state.length : range.end
-    if (end <= range._start) return false
+    this.replicator._updateFork(this)
 
-    if (range.linear) return !!this._requestRange(peer, range._start, end, 0, 0, range.filter)
+    if (this.remoteLength > this.core.tree.length && this.lengthAcked === this.core.tree.length) {
+      if (this.replicator._addUpgradeMaybe() !== null) this._update()
+    }
 
-    const r = range._start + Math.floor(Math.random() * (end - range._start))
-    return !!(
-      this._requestRange(peer, r, end, 0, 0, range.filter) ||
-      this._requestRange(peer, range._start, r, 0, 0, range.filter)
-    )
-  }
+    const upgrade = (lengthChanged === false || sameFork === false)
+      ? this.canUpgrade && sameFork
+      : await this._canUpgrade(length, fork)
 
-  _updateUpgrade (peer) {
-    const minLength = this.pendingUpgrade
-      ? this.pendingUpgrade.minLength
-      : this.core.tree.length + 1
+    if (length === this.remoteLength && fork === this.core.tree.fork) {
+      this.canUpgrade = upgrade
+    }
 
-    if (this.upgrading || peer.state.length < minLength) return false
-    this.upgrading = new UpgradeLock(peer, peer.state.length)
+    if (--this.syncsProcessing !== 0) return // ie not latest
 
-    const data = {
-      fork: this.core.tree.fork,
-      seek: null,
-      block: null,
-      upgrade: { start: this.core.tree.length, length: peer.state.length - this.core.tree.length }
+    if (this.needsSync === true || (this.core.tree.fork === this.remoteFork && this.core.tree.length > this.remoteLength)) {
+      this.signalUpgrade()
     }
 
-    peer.request(data)
-    return true
+    this._update()
   }
 
-  checkTimeouts (peers) {
-    if (!this.pendingUpgrade || this.upgrading) return
-    if (this.pendingUpgrade.update(peers, this.core.tree.fork)) return
-    this.pendingUpgrade.resolve(false)
-    this.pendingUpgrade = null
+  _shouldUpdateCanUpgrade () {
+    return this.core.tree.fork === this.remoteFork &&
+      this.core.tree.length > this.remoteLength &&
+      this.canUpgrade === false &&
+      this.syncsProcessing === 0
   }
 
-  _requestRange (peer, start, end, seek, nodes, filter = tautology) {
-    const remote = peer.state.bitfield
-    const local = this.core.bitfield
-
-    // TODO: use 0 instead of -1 as end=0 should never be added!
-    if (end === -1) end = peer.state.length
+  async _updateCanUpgradeAndSync () {
+    const len = this.core.tree.length
+    const fork = this.core.tree.fork
 
-    for (let i = start; i < end; i++) {
-      if (!filter(i) || !remote.get(i) || local.get(i)) continue
-      // TODO: if this was a NO_VALUE request, retry if no blocks can be found elsewhere
-      if (this.requests.has(i)) continue
+    const canUpgrade = await this._canUpgrade(this.remoteLength, this.remoteFork)
 
-      // TODO: if seeking and i >= core.length, let that takes precendance in the upgrade req
-      const req = new Request(i, i < this.core.tree.length ? seek : 0, nodes)
-      this.requests.set(i, req)
-      this.send(peer, req)
-      return req
+    if (this.syncsProcessing > 0 || len !== this.core.tree.length || fork !== this.core.tree.fork) {
+      return
+    }
+    if (canUpgrade === this.canUpgrade) {
+      return
     }
 
-    return null
+    this.canUpgrade = canUpgrade
+    this.sendSync()
   }
 
-  // send handles it's own errors so we do not need to await/catch it
-  async send (peer, req) {
-    req.peer = peer
-    peer.state.inflight++ // TODO: a non value request should count less than a value one
+  // Safe to call in the background - never fails
+  async _canUpgrade (remoteLength, remoteFork) {
+    if (remoteFork !== this.core.tree.fork) return false
 
-    // TODO: also check if remote can even upgrade us lol
-    let needsUpgrade = peer.state.length > this.core.tree.length || !!(!this.upgrading && this.pendingUpgrade)
-    const fork = this.core.tree.fork
-    let upgrading = false
+    if (remoteLength === 0) return true
+    if (remoteLength >= this.core.tree.length) return false
 
-    while (needsUpgrade) {
-      if (!this.upgrading) {
-        if (peer.state.length <= this.core.tree.length) {
-          needsUpgrade = false
-          break
-        }
-        // TODO: if the peer fails, we need to resolve the promise as well woop woop
-        // so we need some tracking mechanics for upgrades in general.
-        this.upgrading = new UpgradeLock(peer, peer.state.length)
-        upgrading = true
-        break
-      }
-      if (req.index < this.core.tree.length) {
-        needsUpgrade = false
-        break
-      }
+    try {
+      // Rely on caching to make sure this is cheap...
+      const canUpgrade = await this.core.tree.upgradeable(remoteLength)
+
+      if (remoteFork !== this.core.tree.fork) return false
 
-      await this.upgrading.promise
-      needsUpgrade = peer.state.length > this.core.tree.length || !!(!this.upgrading && this.pendingUpgrade)
+      return canUpgrade
+    } catch {
+      return false
     }
+  }
 
-    const data = {
-      fork,
-      seek: req.seek ? { bytes: req.seek } : null,
-      block: { index: req.index, value: req.value, nodes: 0 },
-      upgrade: needsUpgrade ? { start: this.core.tree.length, length: peer.state.length - this.core.tree.length } : null
+  async _getProof (msg) {
+    const proof = await this.core.tree.proof(msg)
+
+    if (proof.block) {
+      if (msg.fork !== this.core.tree.fork) return null
+      proof.block.value = await this.core.blocks.get(msg.block.index)
     }
 
-    if (data.block.index < this.core.tree.length || this.core.truncating > 0) {
+    return proof
+  }
+
+  async onrequest (msg) {
+    let proof = null
+
+    // TODO: could still be answerable if (index, fork) is an ancestor of the current fork
+    if (msg.fork === this.core.tree.fork) {
       try {
-        data.block.nodes = Math.max(req.nodes, await this.core.tree.nodes(data.block.index * 2))
-      } catch (err) {
-        console.error('TODO handle me:', err.stack)
+        proof = await this._getProof(msg)
+      } catch (err) { // TODO: better error handling here, ie custom errors
+        safetyCatch(err)
       }
     }
 
-    if (peer.destroyed) {
-      req.peer = null
-      this.pending.push(req)
-      if (upgrading) {
-        this.upgrading.resolve()
-        this.upgrading = null
+    if (proof !== null) {
+      if (proof.block !== null) {
+        this.replicator.onupload(proof.block.index, proof.block.value, this)
       }
-      this.replicator.updateAll()
+
+      this.wireData.send({
+        request: msg.id,
+        fork: msg.fork,
+        block: proof.block,
+        hash: proof.hash,
+        seek: proof.seek,
+        upgrade: proof.upgrade
+      })
       return
     }
 
-    if (fork !== this.core.tree.fork || paused(peer, this.core.tree.fork) || this.core.truncating > 0) {
-      if (peer.state.inflight > 0) peer.state.inflight--
-      if (req.promises.length) { // someone is eagerly waiting for this request
-        req.peer = null // resend on some other peer
-        this.pending.push(req)
-      } else { // otherwise delete the request
-        this.requests.delete(req.index)
-      }
-      if (upgrading) {
-        this.upgrading.resolve()
-        this.upgrading = null
+    this.wireNoData.send({
+      request: msg.id
+    })
+  }
+
+  async ondata (data) {
+    const req = data.request > 0 ? this.replicator._inflight.get(data.request) : null
+    const reorg = data.fork > this.core.tree.fork
+
+    // no push atm, TODO: check if this satisfies another pending request
+    // allow reorg pushes tho as those are not written to storage so we'll take all the help we can get
+    if (req === null && reorg === false) return
+
+    if (req !== null) {
+      if (req.peer !== this) return
+      this.inflight--
+      this.replicator._inflight.remove(req.id)
+    }
+
+    if (reorg === true) return this.replicator._onreorgdata(this, req, data)
+
+    try {
+      if (!matchingRequest(req, data) || !(await this.core.verify(data, this))) {
+        this.replicator._onnodata(this, req)
+        return
       }
-      return
+    } catch (err) {
+      this.replicator._onnodata(this, req)
+      throw err
+    }
+
+    this.replicator._ondata(this, req, data)
+
+    if (this._shouldUpdateCanUpgrade() === true) {
+      this._updateCanUpgradeAndSync()
     }
+  }
+
+  onnodata ({ request }) {
+    const req = request > 0 ? this.replicator._inflight.get(request) : null
+
+    if (req === null || req.peer !== this) return
 
-    peer.request(data)
+    this.inflight--
+    this.replicator._inflight.remove(req.id)
+    this.replicator._onnodata(this, req)
   }
 
-  async _onupgrade (proof, peer) {
-    if (!this.upgrading || !proof.upgrade) return
-    if (this.unforking) return
+  onwant () {
+    // TODO
+  }
 
-    await this.core.verify(proof, peer)
+  onunwant () {
+    // TODO
+  }
 
-    // TODO: validate that we actually upgraded our length as well
-    this.upgrading.resolve()
-    this.upgrading = null
+  onbitfield ({ start, bitfield }) {
+    // TODO: tweak this to be more generic
 
-    if (this.pendingUpgrade) {
-      this.pendingUpgrade.resolve(true)
-      this.pendingUpgrade = null
+    if (bitfield.length < 1024) {
+      const buf = b4a.from(bitfield.buffer, bitfield.byteOffset, bitfield.byteLength)
+      const bigger = b4a.concat([buf, b4a.alloc(4096 - buf.length)])
+      bitfield = new Uint32Array(bigger.buffer, bigger.byteOffset, 1024)
     }
 
-    if (this.seeks.length) await this._updateSeeks(null)
+    this.remoteBitfield.pages.set(start / this.core.bitfield.pageSize, bitfield)
 
-    this.update(peer)
+    this._update()
   }
 
-  async _onfork (proof, peer) {
-    // TODO: if proof is from a newer fork than currently unforking, restart
+  onrange ({ drop, start, length }) {
+    const has = drop === false
 
-    if (this.unforking) {
-      await this.unforking.update(proof)
-    } else {
-      const reorg = await this.core.tree.reorg(proof)
-      const verified = reorg.signedBy(this.core.header.signer.publicKey)
-      if (!verified) throw new Error('Remote signature could not be verified')
-      this.unforking = reorg
-    }
-
-    if (!this.unforking.finished) {
-      for (let i = this.unforking.want.start; i < this.unforking.want.end; i++) {
-        if (peer.state.bitfield.get(i)) {
-          const data = {
-            fork: this.unforking.fork,
-            seek: null,
-            block: { index: i, value: false, nodes: this.unforking.want.nodes },
-            upgrade: null
-          }
-          peer.request(data)
-          return
-        }
-      }
-      return
+    for (const end = start + length; start < end; start++) {
+      this.remoteBitfield.set(start, has)
     }
 
-    const reorg = this.unforking
-    this.unforking = null
-    await this.core.reorg(reorg)
+    if (drop === false) this._update()
+  }
+
+  onreorghint () {
+    // TODO
+  }
+
+  _update () {
+    // TODO: if this is in a batch or similar it would be better to defer it
+    // we could do that with nextTick/microtick mb? (combined with a property on the session to signal read buffer mb)
+    this.replicator.updatePeer(this)
+  }
+
+  _makeRequest (fork, needsUpgrade) {
+    if (needsUpgrade === true && this.replicator._shouldUpgrade(this) === false) {
+      return null
+    }
+
+    if (needsUpgrade === false && fork === this.core.tree.fork && this.replicator._autoUpgrade(this) === true) {
+      needsUpgrade = true
+    }
 
-    // reset ranges, also need to reset seeks etc
-    for (const r of this.ranges) {
-      r._start = 0
+    return {
+      peer: this,
+      id: 0,
+      fork,
+      block: null,
+      hash: null,
+      seek: null,
+      upgrade: needsUpgrade === false
+        ? null
+        : { start: this.core.tree.length, length: this.remoteLength - this.core.tree.length }
     }
+  }
 
-    this.replicator.updateAll()
+  _requestUpgrade (u) {
+    const req = this._makeRequest(u.fork, true)
+    if (req === null) return false
 
-    // TODO: we gotta clear out old requests as well here pointing at the old fork
+    this._send(req)
+
+    return true
   }
 
-  async ondata (proof, peer) {
-    // technically if the remote peer pushes a DATA someone else requested inflight can go to zero
-    if (peer.state.inflight > 0) peer.state.inflight--
+  _requestSeek (s) {
+    if (s.seeker.start >= this.core.tree.length) {
+      const req = this._makeRequest(s.fork, true)
 
-    // if we get a message from another fork, maybe "unfork".
-    if (peer.state.fork !== this.core.tree.fork) {
-      // TODO: user should opt-in to this behaivour
-      if (peer.state.fork > this.core.tree.fork) return this._onfork(proof, peer)
-      return
+      // We need an upgrade for the seek, if non can be provided, skip
+      if (req === null) return false
+
+      req.seek = { bytes: s.seeker.bytes }
+
+      s.inflight.push(req)
+      this._send(req)
+
+      return true
     }
 
-    // ignore incoming messages during an unfork.
-    if (this.unforking) return
+    const len = s.seeker.end - s.seeker.start
+    const off = s.seeker.start + Math.floor(Math.random() * len)
 
-    if (!proof.block) return this._onupgrade(proof, peer)
+    for (let i = 0; i < len; i++) {
+      let index = off + i
+      if (index > s.seeker.end) index -= len
 
-    const { index, value } = proof.block
-    const req = this.requests.get(index)
+      if (this.remoteBitfield.get(index) === false) continue
+      if (this.core.bitfield.get(index) === true) continue
 
-    // no push allowed, TODO: add flag to allow pushes
-    if (!req || req.peer !== peer || (value && !req.value) || (proof.upgrade && !this.upgrading)) return
+      // Check if this block is currently inflight - if so pick another
+      const b = this.replicator._blocks.get(s.fork, index)
+      if (b !== null && b.inflight.length > 0) continue
 
-    try {
-      await this.core.verify(proof, peer)
-    } catch (err) {
-      this.requests.delete(index)
-      throw err
-    }
+      // Block is not inflight, but we only want the hash, check if that is inflight
+      const h = this.replicator._hashes.add(s.fork, index)
+      if (h.inflight.length > 0) continue
 
-    // TODO: validate that we actually upgraded our length as well
-    if (proof.upgrade) {
-      this.upgrading.resolve()
-      this.upgrading = null
+      const req = this._makeRequest(s.fork, false)
 
-      if (this.pendingUpgrade) {
-        this.pendingUpgrade.resolve(true)
-        this.pendingUpgrade = null
-      }
+      req.hash = { index: 2 * index, nodes: 0 }
+      req.seek = { bytes: s.seeker.bytes }
+
+      s.inflight.push(req)
+      h.inflight.push(req)
+      this._send(req)
+
+      return true
     }
 
-    await this._resolveRequest(req, index, value)
+    return false
+  }
 
-    this.update(peer)
+  // mb turn this into a YES/NO/MAYBE enum, could simplify ifavail logic
+  _blockAvailable (b) { // TODO: fork also
+    return this.remoteBitfield.get(b.index)
   }
 
-  async _resolveRequest (req, index, value) {
-    // if our request types match, clear inflight, otherwise we upgraded a hash req to a value req
-    const resolved = req.value === !!value
-    if (resolved) {
-      this.requests.delete(index)
-      req.resolve(value)
-    }
+  _requestBlock (b) {
+    if (this.remoteBitfield.get(b.index) === false) return false
 
-    if (this.seeks.length) await this._updateSeeks(req)
+    const req = this._makeRequest(b.fork, b.index >= this.core.tree.length)
+    if (req === null) return false
 
-    // TODO: only do this for active ranges, ie ranges with inflight reqs...
-    for (let i = 0; i < this.ranges.length; i++) {
-      const r = this.ranges[i]
-      if (!r.contains(req)) continue
-      if (!r.update(this.core.bitfield)) continue
-      r.resolve(true)
-      i--
-    }
+    req.block = { index: b.index, nodes: 0 }
+
+    b.inflight.push(req)
+    this._send(req)
+
+    return true
   }
 
-  async _updateSeeks (req) {
-    for (let i = 0; i < this.seeks.length; i++) {
-      await this.seeks[i].update()
-    }
+  _requestRange (r) {
+    const end = Math.min(r.end === -1 ? this.remoteLength : r.end, this.remoteLength)
+    if (end < r.start || r.fork !== this.remoteFork) return false
 
-    for (let i = 0; i < this.seeks.length; i++) {
-      const seek = this.seeks[i]
+    const len = end - r.start
+    const off = r.start + (r.linear ? 0 : Math.floor(Math.random() * len))
 
-      if (seek.finished) {
-        if (this.seeks.length > 1 && i < this.seeks.length - 1) {
-          this.seeks[i] = this.seeks[this.seeks.length - 1]
-          i--
-        }
-        this.seeks.pop()
+    // TODO: we should weight this to request blocks < .length first
+    // as they are "cheaper" and will trigger an auto upgrade if possible
+    // If no blocks < .length is avaible then try the "needs upgrade" range
+
+    for (let i = 0; i < len; i++) {
+      let index = off + i
+      if (index >= end) index -= len
+
+      if (r.blocks !== null) index = r.blocks[index]
+
+      if (this.remoteBitfield.get(index) === false) continue
+      if (this.core.bitfield.get(index) === true) continue
+
+      const b = this.replicator._blocks.add(r.fork, index)
+      if (b.inflight.length > 0) continue
+
+      const req = this._makeRequest(r.fork, index >= this.core.tree.length)
+
+      // If the request cannot be satisfied, dealloc the block request if no one is subscribed to it
+      if (req === null) {
+        b.gc()
+        return false
       }
-      if (req !== null && seek.request === req) seek.request = null
+
+      req.block = { index, nodes: 0 }
+
+      b.inflight.push(req)
+      this._send(req)
+
+      return true
     }
-  }
 
-  async resolveBlock (index, value) {
-    const req = this.requests.get(index)
-    if (req) await this._resolveRequest(req, index, value)
+    return false
   }
 
-  upgrade () {
-    if (this.pendingUpgrade) return this.pendingUpgrade.createPromise()
-    this.pendingUpgrade = new Upgrade(this.core.tree.length + 1)
-    return this.pendingUpgrade.createPromise()
-  }
+  _requestForkProof (f) {
+    const req = this._makeRequest(f.fork, false)
 
-  range (range) {
-    if (range.ranges === null || this.ranges.index(range) > -1) return
-    this.ranges.push(range)
-    range.ranges = range
-  }
+    req.upgrade = { start: 0, length: this.remoteLength }
 
-  seek (seeker) {
-    const s = new Seek(seeker)
-    this.seeks.push(s)
-    return s.createPromise()
+    f.inflight.push(req)
+    this._send(req)
   }
 
-  block (index) {
-    const e = this.requests.get(index)
+  _requestForkRange (f) {
+    if (f.fork !== this.remoteFork || f.batch.want === null) return false
 
-    if (e) {
-      if (!e.value) {
-        e.value = true
-        if (e.peer) this.send(e.peer, e)
-      }
+    const end = Math.min(f.batch.want.end, this.remoteLength)
+    if (end < f.batch.want.start) return false
+
+    const len = end - f.batch.want.start
+    const off = f.batch.want.start + Math.floor(Math.random() * len)
+
+    for (let i = 0; i < len; i++) {
+      let index = off + i
+      if (index >= end) index -= len
+
+      if (this.remoteBitfield.get(index) === false) continue
+
+      const req = this._makeRequest(f.fork, false)
 
-      return e.createPromise()
+      req.hash = { index: 2 * index, nodes: f.batch.want.nodes }
+
+      f.inflight.push(req)
+      this._send(req)
+
+      return true
     }
 
-    const r = new Request(index, 0, 0)
+    return false
+  }
+
+  async _send (req) {
+    const fork = this.core.tree.fork
 
-    this.requests.set(index, r)
-    this.pending.push(r)
+    this.inflight++
+    this.replicator._inflight.add(req)
 
-    return r.createPromise()
+    if (req.upgrade !== null && req.fork === fork) {
+      const u = this.replicator._addUpgrade()
+      u.inflight.push(req)
+    }
+
+    try {
+      if (req.block !== null && req.fork === fork) req.block.nodes = await this.core.tree.missingNodes(2 * req.block.index)
+      if (req.hash !== null && req.fork === fork) req.hash.nodes = await this.core.tree.missingNodes(req.hash.index)
+    } catch (err) {
+      this.stream.destroy(err)
+      return
+    }
+
+    this.wireRequest.send(req)
   }
 }
 
 module.exports = class Replicator {
-  constructor (core, { onupdate }) {
+  constructor (core, key, { eagerUpgrade = true, allowFork = true, onpeerupdate = noop, onupload = noop } = {}) {
+    this.key = key
+    this.discoveryKey = core.crypto.discoveryKey(key)
     this.core = core
+    this.eagerUpgrade = eagerUpgrade
+    this.allowFork = allowFork
+    this.onpeerupdate = onpeerupdate
+    this.onupload = onupload
     this.peers = []
-    this.requests = new RequestPool(this, core)
-    this.updating = null
-    this.pendingPeers = new Set()
-    this.onupdate = onupdate
+
+    this._inflight = new InflightTracker()
+    this._blocks = new BlockTracker(core)
+    this._hashes = new BlockTracker(core)
+
+    this._queued = []
+
+    this._seeks = []
+    this._upgrade = null
+    this._reorgs = []
+    this._ranges = []
+
+    this._ifAvailable = 0
+    this._updatesPending = 0
+    this._applyingReorg = false
   }
 
-  static createProtocol (noiseStream, opts) {
-    return new Protocol(noiseStream, {
-      ...opts,
-      protocolVersion: 0,
-      userAgent: USER_AGENT
-    })
+  cork () {
+    for (const peer of this.peers) peer.protomux.cork()
   }
 
-  joinProtocol (protocol, key, discoveryKey) {
-    if (protocol.isRegistered(discoveryKey)) return
-    const peer = protocol.registerPeer(key, discoveryKey, this, new RemoteState(this.core))
-    this.pendingPeers.add(peer)
+  uncork () {
+    for (const peer of this.peers) peer.protomux.uncork()
   }
 
-  broadcastBlock (start) {
-    const msg = { start, length: 1 }
-    for (const peer of this.peers) peer.have(msg)
+  signalUpgrade () {
+    for (const peer of this.peers) peer.signalUpgrade()
+  }
 
-    // in case of writable peer waiting for the block itself
-    // we trigger the resolver to see if can't resolve it now
-    if (this.requests.isRequesting(start)) {
-      this._resolveBlock(start).then(noop, noop)
-    }
+  broadcastRange (start, length, drop = false) {
+    for (const peer of this.peers) peer.broadcastRange(start, length, drop)
   }
 
-  broadcastInfo () {
-    const msg = { length: this.core.tree.length, fork: this.core.tree.fork }
-    for (const peer of this.peers) peer.info(msg)
+  addUpgrade (session) {
+    if (this._upgrade !== null) {
+      const ref = this._upgrade.attach(session)
+      this._checkUpgradeIfAvailable()
+      return ref
+    }
+
+    const ref = this._addUpgrade().attach(session)
+
+    for (let i = this._reorgs.length - 1; i >= 0 && this._applyingReorg === false; i--) {
+      const f = this._reorgs[i]
+      if (f.batch !== null && f.batch.finished) {
+        this._applyReorg(f)
+        break
+      }
+    }
+
     this.updateAll()
+
+    return ref
   }
 
-  requestUpgrade () {
-    const promise = this.requests.upgrade()
+  addBlock (session, index, fork = this.core.tree.fork) {
+    const b = this._blocks.add(fork, index)
+    const ref = b.attach(session)
+
+    this._queueBlock(b)
     this.updateAll()
-    return promise
+
+    return ref
   }
 
-  requestSeek (seeker) {
-    if (typeof seeker === 'number') seeker = this.core.tree.seek(seeker)
-    const promise = this.requests.seek(seeker)
+  addSeek (session, seeker) {
+    const s = new SeekRequest(this._seeks, this.core.tree.fork, seeker)
+    const ref = s.attach(session)
+
+    this._seeks.push(s)
     this.updateAll()
-    return promise
+
+    return ref
   }
 
-  requestBlock (index) {
-    const promise = this.requests.block(index)
-    this.updateAll()
-    return promise
+  addRange (session, { start = 0, end = -1, length = toLength(start, end), blocks = null, linear = false } = {}) {
+    if (blocks !== null) {
+      if (start >= blocks.length) start = blocks.length
+      if (length === -1 || start + length > blocks.length) length = blocks.length - start
+    }
+
+    const r = new RangeRequest(this._ranges, this.core.tree.fork, start, length === -1 ? -1 : start + length, linear, blocks)
+    const ref = r.attach(session)
+
+    this._ranges.push(r)
+
+    // Trigger this to see if this is already resolved...
+    // Also auto compresses the range based on local bitfield
+    this._updateNonPrimary()
+
+    return ref
   }
 
-  static createRange (start, end, filter, linear) {
-    // createRange(start, end)
-    if (filter === undefined) {
-      filter = tautology
+  cancel (ref) {
+    ref.context.detach(ref)
+  }
 
-    // createRange(start, end, linear)
-    } else if (typeof filter === 'boolean') {
-      linear = filter
-      filter = tautology
+  clearRequests (session) {
+    while (session.length > 0) {
+      const ref = session[session.length - 1]
+      ref.context.detach(ref)
     }
 
-    return new Range(start, end, filter, linear)
+    this.updateAll()
+  }
+
+  _addUpgradeMaybe () {
+    return this.eagerUpgrade === true ? this._addUpgrade() : this._upgrade
   }
 
-  addRange (range) {
-    if (!range.done) {
-      range._ranges = this.requests.ranges
-      this.requests.ranges.push(range)
-      if (range.update(this.core.bitfield)) range.resolve(true)
+  // TODO: this function is OVER called atm, at each updatePeer/updateAll
+  // instead its more efficient to only call it when the conditions in here change - ie on sync/add/remove peer
+  // Do this when we have more tests.
+  _checkUpgradeIfAvailable () {
+    if (this._ifAvailable > 0 || this._upgrade === null || this._upgrade.refs.length === 0) return
+
+    // check if a peer can upgrade us
+
+    for (let i = 0; i < this.peers.length; i++) {
+      const peer = this.peers[i]
+
+      if (peer.remoteSynced === false) return
+
+      if (this.core.tree.length === 0 && peer.remoteLength > 0) return
+
+      if (peer.remoteLength <= this._upgrade.length || peer.remoteFork !== this._upgrade.fork) continue
+
+      if (peer.syncsProcessing > 0) return
+
+      if (peer.lengthAcked !== this.core.tree.length && peer.remoteFork === this.core.tree.fork) return
+      if (peer.remoteCanUpgrade === true) return
     }
-    this.updateAll()
+
+    // check if reorgs in progress...
+
+    if (this._applyingReorg === true) return
+
+    // TODO: we prob should NOT wait for inflight reorgs here, seems better to just resolve the upgrade
+    // and then apply the reorg on the next call in case it's slow - needs some testing in practice
+
+    for (let i = 0; i < this._reorgs.length; i++) {
+      const r = this._reorgs[i]
+      if (r.inflight.length > 0) return
+    }
+
+    // nothing to do, indicate no update avail
+
+    const u = this._upgrade
+    this._upgrade = null
+    u.resolve(false)
   }
 
-  async _resolveBlock (index) {
-    const value = await this.core.blocks.get(index)
-    this.requests.resolveBlock(index, value)
+  _addUpgrade () {
+    if (this._upgrade !== null) return this._upgrade
+
+    // TODO: needs a reorg: true/false flag to indicate if the user requested a reorg
+    this._upgrade = new UpgradeRequest(this, this.core.tree.fork, this.core.tree.length)
+
+    return this._upgrade
   }
 
-  updateAll () {
-    const peers = new RandomIterator(this.peers)
-    for (const peer of peers) {
-      if (paused(peer, this.core.tree.fork)) continue
-      if (this.requests.update(peer)) peers.requeue()
+  _addReorg (fork, peer) {
+    if (this.allowFork === false) return null
+
+    // TODO: eager gc old reorgs from the same peer
+    // not super important because they'll get gc'ed when the request finishes
+    // but just spam the remote can do ...
+
+    for (const f of this._reorgs) {
+      if (f.fork > fork && f.batch !== null) return null
+      if (f.fork === fork) return f
+    }
+
+    const f = {
+      fork,
+      inflight: [],
+      batch: null
+    }
+
+    this._reorgs.push(f)
+
+    // maintain sorted by fork
+    let i = this._reorgs.length - 1
+    while (i > 0 && this._reorgs[i - 1].fork > fork) {
+      this._reorgs[i] = this._reorgs[i - 1]
+      this._reorgs[--i] = f
     }
-    // TODO: this is a silly way of doing it
-    if (this.pendingPeers.size === 0) this.requests.checkTimeouts(this.peers)
+
+    return f
+  }
+
+  _shouldUpgrade (peer) {
+    if (this._upgrade !== null && this._upgrade.inflight.length > 0) return false
+    return peer.remoteCanUpgrade === true &&
+      peer.remoteLength > this.core.tree.length &&
+      peer.lengthAcked === this.core.tree.length
+  }
+
+  _autoUpgrade (peer) {
+    return this._upgrade !== null && this._shouldUpgrade(peer)
+  }
+
+  _addPeer (peer) {
+    this.peers.push(peer)
+    this.updatePeer(peer)
+    this.onpeerupdate(true, peer)
   }
 
-  onunregister (peer, err) {
-    const idx = this.peers.indexOf(peer)
-    if (idx === -1) return
+  _removePeer (peer) {
+    this.peers.splice(this.peers.indexOf(peer), 1)
 
-    this.pendingPeers.delete(peer)
-    this.peers.splice(idx, 1)
-    this.requests.clear(peer)
-    this.onupdate(false, peer)
+    for (const req of this._inflight) {
+      if (req.peer !== peer) continue
+      this._inflight.remove(req.id)
+      this._clearRequest(peer, req)
+    }
 
+    this.onpeerupdate(false, peer)
     this.updateAll()
   }
 
-  oncore (_, peer) {
-    this.pendingPeers.delete(peer)
-    this.peers.push(peer)
-    this.onupdate(true, peer)
+  _queueBlock (b) {
+    if (b.queued === true) return
+    b.queued = true
+    this._queued.push(b)
+  }
 
-    peer.info({ length: this.core.tree.length, fork: this.core.tree.fork })
+  _resolveBlockRequest (tracker, fork, index, value, req) {
+    const b = tracker.remove(fork, index)
+    if (b === null) return false
 
-    // YOLO send over all the pages for now
-    const p = pages(this.core)
-    for (let index = 0; index < p.length; index++) {
-      peer.bitfield({ start: index, bitfield: p[index] })
+    removeInflight(b.inflight, req)
+    b.queued = false
+
+    b.resolve(value)
+
+    return true
+  }
+
+  _resolveUpgradeRequest (req) {
+    if (req !== null) removeInflight(this._upgrade.inflight, req)
+
+    if (this.core.tree.length === this._upgrade.length && this.core.tree.fork === this._upgrade.fork) return false
+
+    const u = this._upgrade
+    this._upgrade = null
+    u.resolve(true)
+
+    return true
+  }
+
+  _clearInflightBlock (tracker, req) {
+    const b = tracker.get(req.fork, req.block.index)
+
+    if (b === null || removeInflight(b.inflight, req) === false) return
+
+    if (b.refs.length > 0 && tracker === this._blocks) {
+      this._queueBlock(b)
+      return
     }
+
+    b.gc()
   }
 
-  onunknowncore (_, peer) {
-    this.pendingPeers.delete(peer)
-    this.updateAll()
-    // This is a no-op because there isn't any state to dealloc currently
+  _clearInflightUpgrade (req) {
+    if (removeInflight(this._upgrade.inflight, req) === false) return
+    this._upgrade.gc()
+  }
+
+  _clearInflightSeeks (req) {
+    for (const s of this._seeks) {
+      if (removeInflight(s.inflight, req) === false) continue
+      s.gc()
+    }
+  }
+
+  _clearInflightReorgs (req) {
+    for (const r of this._reorgs) {
+      removeInflight(r.inflight, req)
+    }
+  }
+
+  _clearOldReorgs (fork) {
+    for (let i = 0; i < this._reorgs.length; i++) {
+      const f = this._reorgs[i]
+      if (f.fork >= fork) continue
+      if (i === this._reorgs.length - 1) this._reorgs.pop()
+      else this._reorgs[i] = this._reorgs.pop()
+      i--
+    }
   }
 
-  oninfo ({ length, fork }, peer) {
-    const len = peer.state.length
-    const forked = peer.state.fork !== fork
+  // "slow" updates here - async but not allowed to ever throw
+  async _updateNonPrimary () {
+    // Check if running, if so skip it and the running one will issue another update for us (debounce)
+    while (++this._updatesPending === 1) {
+      for (let i = 0; i < this._ranges.length; i++) {
+        const r = this._ranges[i]
 
-    peer.state.length = length
-    peer.state.fork = fork
+        while (r.start < r.end && this.core.bitfield.get(mapIndex(r.blocks, r.start)) === true) r.start++
+        while (r.start < r.end && this.core.bitfield.get(mapIndex(r.blocks, r.end - 1)) === true) r.end--
 
-    if (forked) {
-      for (let i = peer.state.length; i < len; i++) {
-        peer.state.bitfield.set(i, false)
+        if (r.end === -1 || r.start < r.end) continue
+
+        if (i < this._ranges.length - 1) this._ranges[i] = this._ranges.pop()
+        else this._ranges.pop()
+
+        i--
+
+        r.resolve(true)
       }
 
-      if (fork > this.core.tree.fork && length > 0) {
-        this.requests.clear(peer) // clear all pending requests from this peer as they forked, this can be removed if we add remote cancel
-        peer.request({ fork, upgrade: { start: 0, length } })
+      for (let i = 0; i < this._seeks.length; i++) {
+        const s = this._seeks[i]
+
+        let err = null
+        let res = null
+
+        try {
+          res = await s.seeker.update()
+        } catch (error) {
+          err = error
+        }
+
+        if (!res && !err) continue
+
+        if (i < this._seeks.length - 1) this._seeks[i] = this._seeks.pop()
+        else this._seeks.pop()
+
+        i--
+
+        if (err) s.reject(err)
+        else s.resolve(res)
       }
+
+      this.updateAll()
+
+      // No additional updates scheduled - return
+      if (--this._updatesPending === 0) return
+      // Debounce the additional updates - continue
+      this._updatesPending = 0
+    }
+  }
+
+  _clearRequest (peer, req) {
+    if (req.block !== null) {
+      this._clearInflightBlock(this._blocks, req)
     }
 
-    if (!peer.state.receivedInfo) {
-      peer.state.receivedInfo = true
+    if (req.hash !== null) {
+      this._clearInflightBlock(this._hashes, req)
     }
 
-    // TODO: do we need to update ALL peers here? prob not
+    if (req.upgrade !== null && this._upgrade !== null) {
+      this._clearInflightUpgrade(req)
+    }
+
+    if (this._seeks.length > 0) {
+      this._clearInflightSeeks(req)
+    }
+
+    if (this._reorgs.length > 0) {
+      this._clearInflightReorgs(req)
+    }
+  }
+
+  _onnodata (peer, req) {
+    this._clearRequest(peer, req)
     this.updateAll()
   }
 
-  onbitfield ({ start, bitfield }, peer) {
-    if (bitfield.length < 1024) {
-      const buf = b4a.from(bitfield.buffer, bitfield.byteOffset, bitfield.byteLength)
-      const bigger = b4a.concat([buf, b4a.alloc(4096 - buf.length)])
-      bitfield = new Uint32Array(bigger.buffer, bigger.byteOffset, 1024)
+  _ondata (peer, req, data) {
+    if (data.block !== null) {
+      this._resolveBlockRequest(this._blocks, data.fork, data.block.index, data.block.value, req)
     }
-    peer.state.bitfield.pages.set(start, bitfield)
 
-    // TODO: do we need to update ALL peers here? prob not
-    this.updateAll()
+    if (data.hash !== null && (data.hash.index & 1) === 0) {
+      this._resolveBlockRequest(this._hashes, data.fork, data.hash.index / 2, null, req)
+    }
+
+    if (this._upgrade !== null) {
+      this._resolveUpgradeRequest(req)
+    }
+
+    if (this._seeks.length > 0) {
+      this._clearInflightSeeks(req)
+    }
+
+    if (this._reorgs.length > 0) {
+      this._clearInflightReorgs(req)
+    }
+
+    if (this._seeks.length > 0 || this._ranges.length > 0) this._updateNonPrimary()
+    else this.updatePeer(peer)
   }
 
-  onhave ({ start, length }, peer) {
-    const end = start + length
-    for (; start < end; start++) {
-      peer.state.bitfield.set(start, true)
+  async _onreorgdata (peer, req, data) {
+    const f = this._addReorg(data.fork, peer)
+
+    if (f === null) {
+      this.updateAll()
+      return
+    }
+
+    removeInflight(f.inflight, req)
+
+    if (f.batch) {
+      await f.batch.update(data)
+    } else {
+      f.batch = await this.core.tree.reorg(data)
+
+      // Remove "older" reorgs in progress as we just verified this one.
+      this._clearOldReorgs(f.fork)
+    }
+
+    if (f.batch.finished) {
+      if (this._addUpgradeMaybe() !== null) {
+        await this._applyReorg(f)
+      }
     }
 
-    // TODO: do we need to update ALL peers here? prob not
     this.updateAll()
   }
 
-  async ondata (proof, peer) {
+  async _applyReorg (f) {
+    // TODO: more optimal here to check if potentially a better reorg
+    // is available, ie higher fork, and request that one first.
+    // This will request that one after this finishes, which is fine, but we
+    // should investigate the complexity in going the other way
+
+    const u = this._upgrade
+
+    this._applyingReorg = true
+    this._reorgs = [] // clear all as the nodes are against the old tree - easier
+
     try {
-      await this.requests.ondata(proof, peer)
+      await this.core.reorg(f.batch, null) // TODO: null should be the first/last peer?
     } catch (err) {
-      // TODO: the request pool should have this cap, so we can just bubble it up
-      this.updateAll()
-      throw err
+      this._upgrade = null
+      u.reject(err)
+    }
+
+    this._applyingReorg = false
+
+    if (this._upgrade !== null) {
+      this._resolveUpgradeRequest(null)
     }
+
+    for (const peer of this.peers) this._updateFork(peer)
+
+    // TODO: all the remaining is a tmp workaround until we have a flag/way for ANY_FORK
+    for (const r of this._ranges) {
+      r.fork = this.core.tree.fork
+      r.start = r.userStart
+      r.end = r.userEnd
+    }
+    for (const s of this._seeks) s.fork = this.core.tree.fork
+    for (const b of this._blocks) b.fork = this.core.tree.fork
+    this._blocks.update(this.core.tree.fork)
+    this.updateAll()
   }
 
-  async onrequest (req, peer) {
-    const fork = req.fork || peer.state.fork
-    if (fork !== this.core.tree.fork) return
+  _maybeUpdate () {
+    return this._upgrade !== null && this._upgrade.inflight.length === 0
+  }
+
+  _updateFork (peer) {
+    if (this._applyingReorg === true || this.allowFork === false || peer.remoteFork <= this.core.tree.fork) {
+      return false
+    }
 
-    const proof = await this.core.tree.proof(req)
+    const f = this._addReorg(peer.remoteFork, peer)
 
-    if (req.block && req.block.value) {
-      proof.block.value = await this.core.blocks.get(req.block.index)
+    // TODO: one per peer is better
+    if (f !== null && f.batch === null && f.inflight.length === 0) {
+      return peer._requestForkProof(f)
     }
 
-    peer.data(proof)
+    return false
   }
-}
 
-function paused (peer, fork) {
-  return peer.state.fork !== fork
+  _updatePeer (peer) {
+    if (peer.inflight >= peer.maxInflight) {
+      return false
+    }
+
+    for (const s of this._seeks) {
+      if (s.inflight.length > 0) continue // TODO: one per peer is better
+      if (peer._requestSeek(s) === true) {
+        return true
+      }
+    }
+
+    // Implied that any block in the queue should be requested, no matter how many inflights
+    const blks = new RandomIterator(this._queued)
+
+    for (const b of blks) {
+      if (b.queued === false || peer._requestBlock(b) === true) {
+        b.queued = false
+        blks.dequeue()
+        return true
+      }
+    }
+
+    return false
+  }
+
+  _updatePeerNonPrimary (peer) {
+    const ranges = new RandomIterator(this._ranges)
+
+    for (const r of ranges) {
+      if (peer._requestRange(r) === true) {
+        return true
+      }
+    }
+
+    // Iterate from newest fork to oldest fork...
+    for (let i = this._reorgs.length - 1; i >= 0; i--) {
+      const f = this._reorgs[i]
+      if (f.batch !== null && f.inflight.length === 0 && peer._requestForkRange(f) === true) {
+        return true
+      }
+    }
+
+    if (this._maybeUpdate() === true && peer._requestUpgrade(this._upgrade) === true) {
+      return true
+    }
+
+    return false
+  }
+
+  updatePeer (peer) {
+    // Quick shortcut to wait for flushing reorgs - not needed but less waisted requests
+    if (this._applyingReorg === true) return
+
+    while (this._updatePeer(peer) === true);
+    while (this._updatePeerNonPrimary(peer) === true);
+
+    this._checkUpgradeIfAvailable()
+  }
+
+  updateAll () {
+    // Quick shortcut to wait for flushing reorgs - not needed but less waisted requests
+    if (this._applyingReorg === true) return
+
+    const peers = new RandomIterator(this.peers)
+
+    for (const peer of peers) {
+      if (this._updatePeer(peer) === true) {
+        peers.requeue()
+      }
+    }
+
+    // Check if we can skip the non primary check fully
+    if (this._maybeUpdate() === false && this._ranges.length === 0 && this._reorgs.length === 0) {
+      this._checkUpgradeIfAvailable()
+      return
+    }
+
+    for (const peer of peers.restart()) {
+      if (this._updatePeerNonPrimary(peer) === true) {
+        peers.requeue()
+      }
+    }
+
+    this._checkUpgradeIfAvailable()
+  }
+
+  attachTo (protomux) {
+    const makePeer = this._makePeer.bind(this, protomux)
+
+    protomux.pair({ protocol: 'hypercore/alpha', id: this.discoveryKey }, makePeer)
+
+    this._ifAvailable++
+    protomux.stream.opened.then((opened) => {
+      this._ifAvailable--
+      if (opened) makePeer()
+      this._checkUpgradeIfAvailable()
+    })
+  }
+
+  _makePeer (protomux) {
+    if (protomux.opened({ protocol: 'hypercore/alpha', id: this.discoveryKey })) return false
+
+    const channel = protomux.createChannel({
+      userData: null,
+      protocol: 'hypercore/alpha',
+      id: this.discoveryKey,
+      handshake: m.wire.handshake,
+      messages: [
+        { encoding: m.wire.sync, onmessage: onwiresync },
+        { encoding: m.wire.request, onmessage: onwirerequest },
+        null, // oncancel
+        { encoding: m.wire.data, onmessage: onwiredata },
+        { encoding: m.wire.noData, onmessage: onwirenodata },
+        { encoding: m.wire.want, onmessage: onwirewant },
+        { encoding: m.wire.unwant, onmessage: onwireunwant },
+        { encoding: m.wire.bitfield, onmessage: onwirebitfield },
+        { encoding: m.wire.range, onmessage: onwirerange },
+        { encoding: m.wire.extension, onmessage: onwireextension }
+      ],
+      onopen: onwireopen,
+      onclose: onwireclose
+    })
+
+    if (channel === null) return false
+
+    const peer = new Peer(this, protomux, channel)
+    const stream = protomux.stream
+
+    peer.channel.open({
+      capability: caps.replicate(stream.isInitiator, this.key, stream.handshakeHash)
+    })
+
+    return true
+  }
 }
 
 function pages (core) {
@@ -840,19 +1467,72 @@ function pages (core) {
   return res
 }
 
-function noop () {}
+function matchingRequest (req, data) {
+  if (data.block !== null && (req.block === null || req.block.index !== data.block.index)) return false
+  if (data.hash !== null && (req.hash === null || req.hash.index !== data.hash.index)) return false
+  if (data.seek !== null && (req.seek === null || req.seek.bytes !== data.seek.bytes)) return false
+  if (data.upgrade !== null && req.upgrade === null) return false
+  return req.fork === data.fork
+}
 
-function tautology () {
+function removeInflight (inf, req) {
+  const i = inf.indexOf(req)
+  if (i === -1) return false
+  if (i < inf.length - 1) inf[i] = inf.pop()
+  else inf.pop()
   return true
 }
 
-function log2 (n) {
-  let res = 1
+function mapIndex (blocks, index) {
+  return blocks === null ? index : blocks[index]
+}
 
-  while (n > 2) {
-    n /= 2
-    res++
-  }
+function noop () {}
 
-  return res
+function toLength (start, end) {
+  return end === -1 ? -1 : (end < start ? 0 : end - start)
+}
+
+function onwireopen (m, c) {
+  return c.userData.onopen(m)
+}
+
+function onwireclose (isRemote, c) {
+  return c.userData.onclose(isRemote)
+}
+
+function onwiresync (m, c) {
+  return c.userData.onsync(m)
+}
+
+function onwirerequest (m, c) {
+  return c.userData.onrequest(m)
+}
+
+function onwiredata (m, c) {
+  return c.userData.ondata(m)
+}
+
+function onwirenodata (m, c) {
+  return c.userData.onnodata(m)
+}
+
+function onwirewant (m, c) {
+  return c.userData.onwant(m)
+}
+
+function onwireunwant (m, c) {
+  return c.userData.onunwant(m)
+}
+
+function onwirebitfield (m, c) {
+  return c.userData.onbitfield(m)
+}
+
+function onwirerange (m, c) {
+  return c.userData.onrange(m)
+}
+
+function onwireextension (m, c) {
+  return c.userData.onextension(m)
 }