hypercore-storage 2.9.0 → 3.0.1

package/encoding/external.js

@@ -0,0 +1,14 @@
+function headLegacyMap(m) {
+  return {
+    version: 2, // version bumped from 1
+    cores: m.allocated.cores,
+    datas: m.allocated.datas,
+    groups: 0,
+    seed: m.seed,
+    defaultDiscoveryKey: m.defaultDiscoveryKey
+  }
+}
+
+module.exports = {
+  headLegacyMap
+}

package/{spec → encoding/spec}/hyperschema/index.js

@@ -1,12 +1,13 @@
 // This file is autogenerated by the hyperschema compiler
-// Schema Version: 1
+// Schema Version: 2
 /* eslint-disable camelcase */
 /* eslint-disable quotes */
 /* eslint-disable space-before-function-paren */
 
 const { c } = require('hyperschema/runtime')
+const external0 = require('../../external.js')
 
-const VERSION = 1
+const VERSION = 2
 
 // eslint-disable-next-line no-unused-vars
 let version = VERSION
@@ -32,10 +33,9 @@ const encoding0 = {
   }
 }
 
-// @corestore/head
+// @corestore/head-v1
 const encoding1 = {
   preencode(state, m) {
-    c.uint.preencode(state, m.version)
     state.end++ // max flag is 4 so always one byte
 
     if (m.allocated) encoding0.preencode(state, m.allocated)
@@ -45,7 +45,6 @@ const encoding1 = {
   encode(state, m) {
     const flags = (m.allocated ? 1 : 0) | (m.seed ? 2 : 0) | (m.defaultDiscoveryKey ? 4 : 0)
 
-    c.uint.encode(state, m.version)
     c.uint.encode(state, flags)
 
     if (m.allocated) encoding0.encode(state, m.allocated)
@@ -53,11 +52,11 @@ const encoding1 = {
     if (m.defaultDiscoveryKey) c.fixed32.encode(state, m.defaultDiscoveryKey)
   },
   decode(state) {
-    const r0 = c.uint.decode(state)
+    const v = c.uint.decode(state)
     const flags = c.uint.decode(state)
 
     return {
-      version: r0,
+      version: v,
       allocated: (flags & 1) !== 0 ? encoding0.decode(state) : null,
       seed: (flags & 2) !== 0 ? c.fixed32.decode(state) : null,
       defaultDiscoveryKey: (flags & 4) !== 0 ? c.fixed32.decode(state) : null
@@ -65,8 +64,99 @@ const encoding1 = {
   }
 }
 
-// @corestore/alias
+// @corestore/head-v2
 const encoding2 = {
+  preencode(state, m) {
+    c.uint.preencode(state, m.cores)
+    c.uint.preencode(state, m.datas)
+    c.uint.preencode(state, m.groups)
+    state.end++ // max flag is 2 so always one byte
+
+    if (m.seed) c.fixed32.preencode(state, m.seed)
+    if (m.defaultDiscoveryKey) c.fixed32.preencode(state, m.defaultDiscoveryKey)
+  },
+  encode(state, m) {
+    const flags = (m.seed ? 1 : 0) | (m.defaultDiscoveryKey ? 2 : 0)
+
+    c.uint.encode(state, m.cores)
+    c.uint.encode(state, m.datas)
+    c.uint.encode(state, m.groups)
+    c.uint.encode(state, flags)
+
+    if (m.seed) c.fixed32.encode(state, m.seed)
+    if (m.defaultDiscoveryKey) c.fixed32.encode(state, m.defaultDiscoveryKey)
+  },
+  decode(state) {
+    const v = c.uint.decode(state)
+    const r0 = c.uint.decode(state)
+    const r1 = c.uint.decode(state)
+    const r2 = c.uint.decode(state)
+    const flags = c.uint.decode(state)
+
+    return {
+      version: v,
+      cores: r0,
+      datas: r1,
+      groups: r2,
+      seed: (flags & 1) !== 0 ? c.fixed32.decode(state) : null,
+      defaultDiscoveryKey: (flags & 2) !== 0 ? c.fixed32.decode(state) : null
+    }
+  }
+}
+
+// @corestore/head
+const encoding3 = {
+  preencode(state, m) {
+    c.uint.preencode(state, m.version)
+    switch (m.version) {
+      case 0:
+      case 1:
+        encoding1.preencode(state, m)
+        break
+      case 2:
+        encoding2.preencode(state, m)
+        break
+      default:
+        throw new Error('Unsupported version')
+    }
+  },
+  encode(state, m) {
+    c.uint.encode(state, m.version)
+    switch (m.version) {
+      case 0:
+      case 1:
+        encoding1.encode(state, m)
+        break
+      case 2:
+        encoding2.encode(state, m)
+        break
+      default:
+        throw new Error('Unsupported version')
+    }
+  },
+  decode(state) {
+    const start = state.start
+    const v = c.uint.decode(state)
+    state.start = start
+    switch (v) {
+      case 0:
+      case 1: {
+        const decoded = encoding1.decode(state)
+        const map = external0.headLegacyMap
+        return map(decoded)
+      }
+      case 2: {
+        const decoded = encoding2.decode(state)
+        return decoded
+      }
+      default:
+        throw new Error('Unsupported version')
+    }
+  }
+}
+
+// @corestore/alias
+const encoding4 = {
   preencode(state, m) {
     c.string.preencode(state, m.name)
     c.fixed32.preencode(state, m.namespace)
@@ -87,14 +177,14 @@ const encoding2 = {
 }
 
 // @corestore/core
-const encoding3 = {
+const encoding5 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     c.uint.preencode(state, m.corePointer)
     c.uint.preencode(state, m.dataPointer)
     state.end++ // max flag is 1 so always one byte
 
-    if (m.alias) encoding2.preencode(state, m.alias)
+    if (m.alias) encoding4.preencode(state, m.alias)
   },
   encode(state, m) {
     const flags = m.alias ? 1 : 0
@@ -104,7 +194,7 @@ const encoding3 = {
     c.uint.encode(state, m.dataPointer)
     c.uint.encode(state, flags)
 
-    if (m.alias) encoding2.encode(state, m.alias)
+    if (m.alias) encoding4.encode(state, m.alias)
   },
   decode(state) {
     const r0 = c.uint.decode(state)
@@ -116,21 +206,21 @@ const encoding3 = {
       version: r0,
       corePointer: r1,
       dataPointer: r2,
-      alias: (flags & 1) !== 0 ? encoding2.decode(state) : null
+      alias: (flags & 1) !== 0 ? encoding4.decode(state) : null
     }
   }
 }
 
-const encoding4_enum = {
+const encoding6_enum = {
   blake2b: 'blake2b'
 }
 
 // @core/hashes enum
-const encoding4 = {
-  preencode (state, m) {
+const encoding6 = {
+  preencode(state, m) {
     state.end++ // max enum is 0 so always one byte
   },
-  encode (state, m) {
+  encode(state, m) {
     switch (m) {
       case 'blake2b':
         c.uint.encode(state, 0)
@@ -139,25 +229,26 @@ const encoding4 = {
         throw new Error('Unknown enum')
     }
   },
-  decode (state) {
+  decode(state) {
     switch (c.uint.decode(state)) {
       case 0:
         return 'blake2b'
-      default: return null
+      default:
+        return null
     }
   }
 }
 
-const encoding5_enum = {
+const encoding7_enum = {
   ed25519: 'ed25519'
 }
 
 // @core/signatures enum
-const encoding5 = {
-  preencode (state, m) {
+const encoding7 = {
+  preencode(state, m) {
     state.end++ // max enum is 0 so always one byte
   },
-  encode (state, m) {
+  encode(state, m) {
     switch (m) {
       case 'ed25519':
         c.uint.encode(state, 0)
@@ -166,17 +257,18 @@ const encoding5 = {
         throw new Error('Unknown enum')
     }
   },
-  decode (state) {
+  decode(state) {
     switch (c.uint.decode(state)) {
       case 0:
         return 'ed25519'
-      default: return null
+      default:
+        return null
     }
   }
 }
 
 // @core/tree-node
-const encoding6 = {
+const encoding8 = {
   preencode(state, m) {
     c.uint.preencode(state, m.index)
     c.uint.preencode(state, m.size)
@@ -201,19 +293,19 @@ const encoding6 = {
 }
 
 // @core/signer
-const encoding7 = {
+const encoding9 = {
   preencode(state, m) {
-    encoding5.preencode(state, m.signature)
+    encoding7.preencode(state, m.signature)
     c.fixed32.preencode(state, m.namespace)
     c.fixed32.preencode(state, m.publicKey)
   },
   encode(state, m) {
-    encoding5.encode(state, m.signature)
+    encoding7.encode(state, m.signature)
     c.fixed32.encode(state, m.namespace)
     c.fixed32.encode(state, m.publicKey)
   },
   decode(state) {
-    const r0 = encoding5.decode(state)
+    const r0 = encoding7.decode(state)
     const r1 = c.fixed32.decode(state)
     const r2 = c.fixed32.decode(state)
 
@@ -226,7 +318,7 @@ const encoding7 = {
 }
 
 // @core/prologue
-const encoding8 = {
+const encoding10 = {
   preencode(state, m) {
     c.fixed32.preencode(state, m.hash)
     c.uint.preencode(state, m.length)
@@ -247,21 +339,21 @@ const encoding8 = {
 }
 
 // @core/manifest.signers
-const encoding9_4 = c.array(encoding7)
+const encoding11_4 = c.array(encoding9)
 // @core/manifest.linked
-const encoding9_6 = c.array(c.fixed32)
+const encoding11_6 = c.array(c.fixed32)
 
 // @core/manifest
-const encoding9 = {
+const encoding11 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     state.end++ // max flag is 8 so always one byte
-    encoding4.preencode(state, m.hash)
+    encoding6.preencode(state, m.hash)
     c.uint.preencode(state, m.quorum)
-    encoding9_4.preencode(state, m.signers)
+    encoding11_4.preencode(state, m.signers)
 
-    if (m.prologue) encoding8.preencode(state, m.prologue)
-    if (m.linked) encoding9_6.preencode(state, m.linked)
+    if (m.prologue) encoding10.preencode(state, m.prologue)
+    if (m.linked) encoding11_6.preencode(state, m.linked)
     if (m.userData) c.buffer.preencode(state, m.userData)
   },
   encode(state, m) {
@@ -270,12 +362,12 @@ const encoding9 = {
 
     c.uint.encode(state, m.version)
     c.uint.encode(state, flags)
-    encoding4.encode(state, m.hash)
+    encoding6.encode(state, m.hash)
     c.uint.encode(state, m.quorum)
-    encoding9_4.encode(state, m.signers)
+    encoding11_4.encode(state, m.signers)
 
-    if (m.prologue) encoding8.encode(state, m.prologue)
-    if (m.linked) encoding9_6.encode(state, m.linked)
+    if (m.prologue) encoding10.encode(state, m.prologue)
+    if (m.linked) encoding11_6.encode(state, m.linked)
     if (m.userData) c.buffer.encode(state, m.userData)
   },
   decode(state) {
@@ -284,19 +376,19 @@ const encoding9 = {
 
     return {
       version: r0,
-      hash: encoding4.decode(state),
+      hash: encoding6.decode(state),
       quorum: c.uint.decode(state),
       allowPatch: (flags & 1) !== 0,
-      signers: encoding9_4.decode(state),
-      prologue: (flags & 2) !== 0 ? encoding8.decode(state) : null,
-      linked: (flags & 4) !== 0 ? encoding9_6.decode(state) : null,
+      signers: encoding11_4.decode(state),
+      prologue: (flags & 2) !== 0 ? encoding10.decode(state) : null,
+      linked: (flags & 4) !== 0 ? encoding11_6.decode(state) : null,
       userData: (flags & 8) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @core/keyPair
-const encoding10 = {
+const encoding12 = {
   preencode(state, m) {
     c.buffer.preencode(state, m.publicKey)
     c.optionalBuffer.preencode(state, m.secretKey)
@@ -316,18 +408,44 @@ const encoding10 = {
   }
 }
 
+// @core/group
+const encoding13 = {
+  preencode(state, m) {
+    state.end++ // max flag is 2 so always one byte
+
+    if (m.key) c.fixed32.preencode(state, m.key)
+    if (m.pointer) c.uint.preencode(state, m.pointer)
+  },
+  encode(state, m) {
+    const flags = (m.key ? 1 : 0) | (m.pointer ? 2 : 0)
+
+    c.uint.encode(state, flags)
+
+    if (m.key) c.fixed32.encode(state, m.key)
+    if (m.pointer) c.uint.encode(state, m.pointer)
+  },
+  decode(state) {
+    const flags = c.uint.decode(state)
+
+    return {
+      key: (flags & 1) !== 0 ? c.fixed32.decode(state) : null,
+      pointer: (flags & 2) !== 0 ? c.uint.decode(state) : 0
+    }
+  }
+}
+
 // @core/auth.manifest
-const encoding11_2 = c.frame(encoding9)
+const encoding14_2 = c.frame(encoding11)
 
 // @core/auth
-const encoding11 = {
+const encoding14 = {
   preencode(state, m) {
     c.fixed32.preencode(state, m.key)
     c.fixed32.preencode(state, m.discoveryKey)
     state.end++ // max flag is 4 so always one byte
 
-    if (m.manifest) encoding11_2.preencode(state, m.manifest)
-    if (m.keyPair) encoding10.preencode(state, m.keyPair)
+    if (m.manifest) encoding14_2.preencode(state, m.manifest)
+    if (m.keyPair) encoding12.preencode(state, m.keyPair)
     if (m.encryptionKey) c.buffer.preencode(state, m.encryptionKey)
   },
   encode(state, m) {
@@ -337,8 +455,8 @@ const encoding11 = {
     c.fixed32.encode(state, m.discoveryKey)
     c.uint.encode(state, flags)
 
-    if (m.manifest) encoding11_2.encode(state, m.manifest)
-    if (m.keyPair) encoding10.encode(state, m.keyPair)
+    if (m.manifest) encoding14_2.encode(state, m.manifest)
+    if (m.keyPair) encoding12.encode(state, m.keyPair)
     if (m.encryptionKey) c.buffer.encode(state, m.encryptionKey)
   },
   decode(state) {
@@ -349,44 +467,54 @@ const encoding11 = {
     return {
       key: r0,
       discoveryKey: r1,
-      manifest: (flags & 1) !== 0 ? encoding11_2.decode(state) : null,
-      keyPair: (flags & 2) !== 0 ? encoding10.decode(state) : null,
+      manifest: (flags & 1) !== 0 ? encoding14_2.decode(state) : null,
+      keyPair: (flags & 2) !== 0 ? encoding12.decode(state) : null,
       encryptionKey: (flags & 4) !== 0 ? c.buffer.decode(state) : null
     }
   }
 }
 
 // @core/head
-const encoding12 = {
+const encoding15 = {
   preencode(state, m) {
     c.uint.preencode(state, m.fork)
     c.uint.preencode(state, m.length)
     c.fixed32.preencode(state, m.rootHash)
     c.optionalBuffer.preencode(state, m.signature)
+    state.end++ // max flag is 1 so always one byte
+
+    if (version >= 2 && m.timestamp) c.uint64.preencode(state, m.timestamp)
   },
   encode(state, m) {
+    const flags = version >= 2 && m.timestamp ? 1 : 0
+
     c.uint.encode(state, m.fork)
     c.uint.encode(state, m.length)
     c.fixed32.encode(state, m.rootHash)
     c.optionalBuffer.encode(state, m.signature)
+    c.uint.encode(state, flags)
+
+    if (version >= 2 && m.timestamp) c.uint64.encode(state, m.timestamp)
   },
   decode(state) {
     const r0 = c.uint.decode(state)
     const r1 = c.uint.decode(state)
     const r2 = c.fixed32.decode(state)
     const r3 = c.optionalBuffer.decode(state)
+    const flags = state.start < state.end ? c.uint.decode(state) : 0
 
     return {
       fork: r0,
       length: r1,
       rootHash: r2,
-      signature: r3
+      signature: r3,
+      timestamp: version >= 2 && (flags & 1) !== 0 ? c.uint64.decode(state) : 0
     }
   }
 }
 
 // @core/hints
-const encoding13 = {
+const encoding16 = {
   preencode(state, m) {
     state.end++ // max flag is 4 so always one byte
 
@@ -416,7 +544,7 @@ const encoding13 = {
 }
 
 // @core/session
-const encoding14 = {
+const encoding17 = {
   preencode(state, m) {
     c.string.preencode(state, m.name)
     c.uint.preencode(state, m.dataPointer)
@@ -437,10 +565,10 @@ const encoding14 = {
 }
 
 // @core/sessions
-const encoding15 = c.array(encoding14)
+const encoding18 = c.array(encoding17)
 
 // @core/dependency
-const encoding16 = {
+const encoding19 = {
   preencode(state, m) {
     c.uint.preencode(state, m.dataPointer)
     c.uint.preencode(state, m.length)
@@ -477,9 +605,9 @@ function decode(name, buffer, v = VERSION) {
 function getEnum(name) {
   switch (name) {
     case '@core/hashes':
-      return encoding4_enum
+      return encoding6_enum
     case '@core/signatures':
-      return encoding5_enum
+      return encoding7_enum
     default:
       throw new Error('Enum not found ' + name)
   }
@@ -489,38 +617,44 @@ function getEncoding(name) {
   switch (name) {
     case '@corestore/allocated':
       return encoding0
-    case '@corestore/head':
+    case '@corestore/head-v1':
       return encoding1
-    case '@corestore/alias':
+    case '@corestore/head-v2':
       return encoding2
-    case '@corestore/core':
+    case '@corestore/head':
       return encoding3
-    case '@core/hashes':
+    case '@corestore/alias':
       return encoding4
-    case '@core/signatures':
+    case '@corestore/core':
       return encoding5
-    case '@core/tree-node':
+    case '@core/hashes':
       return encoding6
-    case '@core/signer':
+    case '@core/signatures':
       return encoding7
-    case '@core/prologue':
+    case '@core/tree-node':
       return encoding8
-    case '@core/manifest':
+    case '@core/signer':
       return encoding9
-    case '@core/keyPair':
+    case '@core/prologue':
       return encoding10
-    case '@core/auth':
+    case '@core/manifest':
       return encoding11
-    case '@core/head':
+    case '@core/keyPair':
       return encoding12
-    case '@core/hints':
+    case '@core/group':
       return encoding13
-    case '@core/session':
+    case '@core/auth':
       return encoding14
-    case '@core/sessions':
+    case '@core/head':
       return encoding15
-    case '@core/dependency':
+    case '@core/hints':
       return encoding16
+    case '@core/session':
+      return encoding17
+    case '@core/sessions':
+      return encoding18
+    case '@core/dependency':
+      return encoding19
     default:
       throw new Error('Encoder not found ' + name)
   }