hypercore 10.37.16 → 10.37.18

package/lib/core.js

@@ -107,7 +107,7 @@ module.exports = class Core {
         external: null,
         key: opts.key || (compat ? manifest.signers[0].publicKey : Verifier.manifestHash(manifest)),
         manifest,
-        keyPair,
+        keyPair: keyPair ? { publicKey: keyPair.publicKey, secretKey: keyPair.secretKey || null } : null,
         userData: [],
         tree: {
           fork: 0,
@@ -131,6 +131,11 @@ module.exports = class Core {
     header.tree.rootHash = unslab(header.tree.rootHash)
     header.tree.signature = unslab(header.tree.signature)
 
+    if (header.keyPair) {
+      header.keyPair.publicKey = unslab(header.keyPair.publicKey)
+      header.keyPair.secretKey = unslab(header.keyPair.secretKey)
+    }
+
     if (opts.manifest) {
       // if we provide a manifest and no key, verify that the stored key is the same
       if (!opts.key && !Verifier.isValidManifest(header.key, Verifier.createManifest(opts.manifest))) {
@@ -204,6 +209,10 @@ module.exports = class Core {
       }
     }
 
+    for (const entry of header.userData) {
+      entry.value = unslab(entry.value)
+    }
+
     return new this(header, compat, crypto, oplog, bigHeader, tree, blocks, bitfield, verifier, opts.sessions || [], legacy, opts.globalCache || null, opts.onupdate || noop, opts.onconflict || noop)
   }
 
@@ -1022,6 +1031,8 @@ function addReorgHint (list, tree, batch) {
 }
 
 function updateUserData (list, key, value) {
+  value = unslab(value)
+
   for (let i = 0; i < list.length; i++) {
     if (list[i].key === key) {
       if (value) list[i].value = value

package/lib/replicator.js

@@ -972,8 +972,8 @@ class Peer {
       this._remoteContiguousLength = start
     }
 
-    if (start === 0 && drop === false && length > this._remoteContiguousLength) {
-      this._remoteContiguousLength = length
+    if (start === 0 && drop === false) {
+      if (length > this._remoteContiguousLength) this._remoteContiguousLength = length
     } else if (length === 1) {
       const bitfield = this.core.skipBitfield === null ? this.core.bitfield : this.core.skipBitfield
       this.remoteBitfield.set(start, has)
@@ -1095,7 +1095,7 @@ class Peer {
       let index = off + i
       if (index > s.seeker.end) index -= len
 
-      if (this.remoteBitfield.get(index) === false) continue
+      if (this._remoteHasBlock(index) === false) continue
       if (this.core.bitfield.get(index) === true) continue
       if (!this._hasTreeParent(index)) continue
 
@@ -1997,6 +1997,17 @@ module.exports = class Replicator {
   }
 
   _onwant (peer, start, length) {
+    const contig = Math.min(this.core.tree.length, this.core.header.hints.contiguousLength)
+
+    if (start + length < contig || (this.core.tree.length === contig)) {
+      peer.wireRange.send({
+        drop: false,
+        start: 0,
+        length: contig
+      })
+      return
+    }
+
     length = Math.min(length, this.core.tree.length - start)
 
     peer.protomux.cork()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.37.16",
+  "version": "10.37.18",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {