corestore 6.0.1-alpha.11 → 6.0.1-alpha.12

package/.github/workflows/test-node.yml

@@ -1,23 +1,22 @@
-name: Test on Node.js
-
+name: Build Status
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 jobs:
   build:
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [lts/*]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install

package/index.js

@@ -43,7 +43,7 @@ module.exports = class Corestore extends EventEmitter {
     if (opts._discoveryKey) {
       return {
         keyPair: null,
-        sign: null,
+        auth: null,
         discoveryKey: opts._discoveryKey
       }
     }
@@ -54,16 +54,17 @@ module.exports = class Corestore extends EventEmitter {
           secretKey: opts.secretKey
         },
         sign: opts.sign,
+        auth: opts.auth,
         discoveryKey: crypto.discoveryKey(opts.publicKey)
       }
     }
-    const { publicKey, sign } = await this.keys.createHypercoreKeyPair(opts.name, this._namespace)
+    const { publicKey, auth } = await this.keys.createHypercoreKeyPair(opts.name, this._namespace)
     return {
       keyPair: {
         publicKey,
         secretKey: null
       },
-      sign,
+      auth,
       discoveryKey: crypto.discoveryKey(publicKey)
     }
   }
@@ -80,11 +81,11 @@ module.exports = class Corestore extends EventEmitter {
     if (!name) return
 
     const namespace = this._getPrereadyUserData(core, USERDATA_NAMESPACE_KEY)
-    const { publicKey, sign } = await this.keys.createHypercoreKeyPair(b4a.toString(name), namespace)
+    const { publicKey, auth } = await this.keys.createHypercoreKeyPair(b4a.toString(name), namespace)
     if (!b4a.equals(publicKey, core.key)) throw new Error('Stored core key does not match the provided name')
 
-    // TODO: Should Hypercore expose a helper for this, or should preready return keypair/sign?
-    core.sign = sign
+    // TODO: Should Hypercore expose a helper for this, or should preready return keypair/auth?
+    core.auth = auth
     core.key = publicKey
     core.writable = true
   }
@@ -92,12 +93,12 @@ module.exports = class Corestore extends EventEmitter {
   async _preload (opts) {
     await this.ready()
 
-    const { discoveryKey, keyPair, sign } = await this._generateKeys(opts)
+    const { discoveryKey, keyPair, auth } = await this._generateKeys(opts)
     const id = b4a.toString(discoveryKey, 'hex')
 
     while (this.cores.has(id)) {
       const existing = this.cores.get(id)
-      if (existing.opened && !existing.closing) return { from: existing, keyPair, sign }
+      if (existing.opened && !existing.closing) return { from: existing, keyPair, auth }
       if (!existing.opened) {
         await existing.ready().catch(safetyCatch)
       } else if (existing.closing) {
@@ -119,7 +120,7 @@ module.exports = class Corestore extends EventEmitter {
       autoClose: true,
       encryptionKey: opts.encryptionKey || null,
       userData,
-      sign: null,
+      auth,
       createIfMissing: !opts._discoveryKey,
       keyPair: keyPair && keyPair.publicKey
         ? {
@@ -144,7 +145,7 @@ module.exports = class Corestore extends EventEmitter {
       this.cores.delete(id)
     })
 
-    return { from: core, keyPair, sign }
+    return { from: core, keyPair, auth }
   }
 
   get (opts = {}) {

package/lib/keys.js

@@ -28,7 +28,12 @@ module.exports = class KeyManager {
     const keyPair = {
       publicKey: b4a.allocUnsafe(sodium.crypto_sign_PUBLICKEYBYTES),
       _secretKey: b4a.alloc(sodium.crypto_sign_SECRETKEYBYTES),
-      sign: (msg) => this._sign(keyPair, msg)
+      auth: {
+        sign: (msg) => this._sign(keyPair, msg),
+        verify: (signable, signature) => {
+          return sodium.crypto_sign_detached(signature, signable, keyPair.publicKey)
+        }
+      }
     }
 
     sodium.crypto_sign_seed_keypair(keyPair.publicKey, keyPair._secretKey, this.createSecret(name, token))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "corestore",
-  "version": "6.0.1-alpha.11",
+  "version": "6.0.1-alpha.12",
   "description": "A Hypercore factory that simplifies managing collections of cores.",
   "main": "index.js",
   "scripts": {