hypercore 11.27.14 → 11.27.16

package/index.js

@@ -171,7 +171,8 @@ class Hypercore extends EventEmitter {
     }
 
     if (opts.ondiscoverykey) {
-      noiseStream.userData.pair({ protocol: 'hypercore/alpha' }, opts.ondiscoverykey)
+      const ondiscoverykey = createDiscoveryKeyHandler(opts.ondiscoverykey)
+      noiseStream.userData.pair({ protocol: 'hypercore/alpha' }, ondiscoverykey)
     }
 
     return outerStream
@@ -1295,3 +1296,11 @@ function isEncryptionProvider(e) {
 function isFunction(fn) {
   return !!fn && typeof fn === 'function'
 }
+
+function createDiscoveryKeyHandler(fn) {
+  return ondiscoverykey
+  function ondiscoverykey(id) {
+    if (!id || id.byteLength !== 32) throw BAD_ARGUMENT('Invalid discovery key')
+    return fn(id)
+  }
+}

package/lib/core.js

@@ -682,7 +682,9 @@ module.exports = class Core {
     }
 
     // Attempt to repair local merkle tree with remote roots
-    const tx = this.storage.write()
+    const atom = this.storage.createAtom()
+    const atomized = this.storage.atomize(atom)
+    const tx = atomized.write()
     for (const node of proof.upgrade.nodes) {
       tx.putTreeNode(node)
     }
@@ -690,7 +692,7 @@ module.exports = class Core {
 
     // Try local proof again
     try {
-      const rx = this.state.storage.read()
+      const rx = atomized.read()
       const treeProofPromise = MerkleTree.proof(this.state, rx, {
         block: null,
         hash: null,
@@ -715,6 +717,8 @@ module.exports = class Core {
       return false
     }
 
+    await atom.flush()
+
     for (let i = this.monitors.length - 1; i >= 0; i--) {
       this.monitors[i].emit('repaired', proof)
     }

package/package.json

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