autobee 1.0.9 → 2.0.0-rc.0

package/encoding/legacy.js

@@ -215,6 +215,7 @@ const OplogMessageV1 = {
     throw new Error('Encoding not supported')
   },
   decode(state) {
+    c.uint.decode(state) // version
     const maxSupportedVersion = c.uint.decode(state)
 
     const flags = c.uint.decode(state)
@@ -245,6 +246,7 @@ const OplogMessageV0 = {
     throw new Error('Encoding not supported')
   },
   decode(state) {
+    c.uint.decode(state) // version
     const flags = c.uint.decode(state)
 
     const isCheckpointer = (flags & 1) !== 0
@@ -288,13 +290,12 @@ const SystemWriterV0 = {
 function infoLegacyMap(info) {
   return {
     version: info.version,
-    members: info.members,
-    pendingIndexers: info.pendingIndexers,
-    indexers: info.indexers,
-    heads: info.heads,
+    timestamp: 0,
+    flushes: 0,
+    view: null,
     views: info.views,
-    encryptionLength: 0,
-    entropy: null
+    heads: info.heads,
+    indexers: info.indexers
   }
 }
 

package/encoding/spec/autobee/index.js

@@ -557,18 +557,29 @@ const encoding19 = {
 // @autobee/system-writer-v4
 const encoding20 = {
   preencode(state, m) {
-    state.end++ // max flag is 2 so always one byte
+    state.end++ // max flag is 16 so always one byte
     c.uint.preencode(state, m.weight)
+    c.uint.preencode(state, m.maxWeight)
     c.uint.preencode(state, m.length)
     c.uint.preencode(state, m.clock)
+
+    if (m.timestamp) c.int.preencode(state, m.timestamp)
   },
   encode(state, m) {
-    const flags = (m.isRemoved ? 1 : 0) | (m.isOplog ? 2 : 0)
+    const flags =
+      (m.isRemoved ? 1 : 0) |
+      (m.isOplog ? 2 : 0) |
+      (m.isGenesis ? 4 : 0) |
+      (m.isAnchor ? 8 : 0) |
+      (m.timestamp ? 16 : 0)
 
     c.uint.encode(state, flags)
     c.uint.encode(state, m.weight)
+    c.uint.encode(state, m.maxWeight)
     c.uint.encode(state, m.length)
     c.uint.encode(state, m.clock)
+
+    if (m.timestamp) c.int.encode(state, m.timestamp)
   },
   decode(state) {
     const v = c.uint.decode(state)
@@ -579,8 +590,12 @@ const encoding20 = {
       isRemoved: (flags & 1) !== 0,
       isOplog: (flags & 2) !== 0,
       weight: c.uint.decode(state),
+      maxWeight: c.uint.decode(state),
       length: c.uint.decode(state),
-      clock: c.uint.decode(state)
+      clock: c.uint.decode(state),
+      isGenesis: (flags & 4) !== 0,
+      isAnchor: (flags & 8) !== 0,
+      timestamp: (flags & 16) !== 0 ? c.int.decode(state) : 0
     }
   }
 }
@@ -645,8 +660,33 @@ const encoding21 = {
 // @autobee/link
 const encoding22 = encoding0
 
-// @autobee/batch
+// @autobee/external-batch
 const encoding23 = {
+  preencode(state, m) {
+    c.fixed32.preencode(state, m.key)
+    c.uint.preencode(state, m.start)
+    c.uint.preencode(state, m.length)
+  },
+  encode(state, m) {
+    c.fixed32.encode(state, m.key)
+    c.uint.encode(state, m.start)
+    c.uint.encode(state, m.length)
+  },
+  decode(state) {
+    const r0 = c.fixed32.decode(state)
+    const r1 = c.uint.decode(state)
+    const r2 = c.uint.decode(state)
+
+    return {
+      key: r0,
+      start: r1,
+      length: r2
+    }
+  }
+}
+
+// @autobee/batch
+const encoding24 = {
   preencode(state, m) {
     c.uint.preencode(state, m.start)
     c.uint.preencode(state, m.end)
@@ -667,108 +707,203 @@ const encoding23 = {
 }
 
 // @autobee/views
-const encoding24 = {
+const encoding25 = {
   preencode(state, m) {
-    encoding22.preencode(state, m.system)
     c.uint.preencode(state, m.flushes)
+    encoding23.preencode(state, m.system)
     state.end++ // flags are fixed size
 
-    if (m.view) encoding22.preencode(state, m.view)
+    if (m.view) encoding23.preencode(state, m.view)
   },
   encode(state, m) {
     const flags = m.view ? 1 : 0
 
-    encoding22.encode(state, m.system)
     c.uint.encode(state, m.flushes)
+    encoding23.encode(state, m.system)
     c.uint8.encode(state, flags)
 
-    if (m.view) encoding22.encode(state, m.view)
+    if (m.view) encoding23.encode(state, m.view)
   },
   decode(state) {
-    const r0 = encoding22.decode(state)
-    const r1 = c.uint.decode(state)
+    const r0 = c.uint.decode(state)
+    const r1 = encoding23.decode(state)
     const flags = c.uint8.decode(state)
 
     return {
-      system: r0,
-      flushes: r1,
-      view: (flags & 1) !== 0 ? encoding22.decode(state) : null
+      flushes: r0,
+      system: r1,
+      view: (flags & 1) !== 0 ? encoding23.decode(state) : null
     }
   }
 }
 
 // @autobee/views (inline)
-const encoding24_inline = {
+const encoding25_inline = {
   preencode(state, m) {
-    encoding22.preencode(state, m.system)
     c.uint.preencode(state, m.flushes)
+    encoding23.preencode(state, m.system)
 
-    if (m.view) encoding22.preencode(state, m.view)
+    if (m.view) encoding23.preencode(state, m.view)
   },
   encode(state, m) {
-    encoding22.encode(state, m.system)
     c.uint.encode(state, m.flushes)
+    encoding23.encode(state, m.system)
 
-    if (m.view) encoding22.encode(state, m.view)
+    if (m.view) encoding23.encode(state, m.view)
   },
   decode(state, inlining) {
-    const r0 = encoding22.decode(state)
-    const r1 = c.uint.decode(state)
+    const r0 = c.uint.decode(state)
+    const r1 = encoding23.decode(state)
     const flags = inlining
 
     return {
-      system: r0,
-      flushes: r1,
-      view: (flags & 1) !== 0 ? encoding22.decode(state) : null
+      flushes: r0,
+      system: r1,
+      view: (flags & 1) !== 0 ? encoding23.decode(state) : null
+    }
+  }
+}
+
+// @autobee/signed-backer
+const encoding26 = {
+  preencode(state, m) {
+    c.fixed32.preencode(state, m.key)
+    c.uint.preencode(state, m.length)
+    c.fixed64.preencode(state, m.signature)
+    c.buffer.preencode(state, m.manifest)
+  },
+  encode(state, m) {
+    c.fixed32.encode(state, m.key)
+    c.uint.encode(state, m.length)
+    c.fixed64.encode(state, m.signature)
+    c.buffer.encode(state, m.manifest)
+  },
+  decode(state) {
+    const r0 = c.fixed32.decode(state)
+    const r1 = c.uint.decode(state)
+    const r2 = c.fixed64.decode(state)
+    const r3 = c.buffer.decode(state)
+
+    return {
+      key: r0,
+      length: r1,
+      signature: r2,
+      manifest: r3
+    }
+  }
+}
+
+// @autobee/witness.backer
+const encoding27_1 = c.frame(encoding26)
+
+// @autobee/witness
+const encoding27 = {
+  preencode(state, m) {
+    c.uint.preencode(state, m.weight)
+    encoding27_1.preencode(state, m.backer)
+  },
+  encode(state, m) {
+    c.uint.encode(state, m.weight)
+    encoding27_1.encode(state, m.backer)
+  },
+  decode(state) {
+    const r0 = c.uint.decode(state)
+    const r1 = encoding27_1.decode(state)
+
+    return {
+      weight: r0,
+      backer: r1
     }
   }
 }
 
+// @autobee/attestation
+const encoding28 = {
+  preencode(state, m) {
+    c.fixed32.preencode(state, m.key)
+    c.uint.preencode(state, m.weight)
+    c.fixed64.preencode(state, m.signature)
+  },
+  encode(state, m) {
+    c.fixed32.encode(state, m.key)
+    c.uint.encode(state, m.weight)
+    c.fixed64.encode(state, m.signature)
+  },
+  decode(state) {
+    const r0 = c.fixed32.decode(state)
+    const r1 = c.uint.decode(state)
+    const r2 = c.fixed64.decode(state)
+
+    return {
+      key: r0,
+      weight: r1,
+      signature: r2
+    }
+  }
+}
+
+// @autobee/oplog-message-v3.witness
+const encoding29_6 = c.frame(encoding27)
+// @autobee/oplog-message-v3.attestations
+const encoding29_7 = c.array(c.frame(encoding28))
+
 // @autobee/oplog-message-v3
-const encoding25 = {
+const encoding29 = {
   preencode(state, m) {
     c.uint.preencode(state, m.timestamp)
-    encoding25_1.preencode(state, m.links)
-    state.end++ // max flag is 16 so always one byte
+    encoding29_1.preencode(state, m.links)
+    state.end++ // max flag is 64 so always one byte
 
-    if (m.batch) encoding23.preencode(state, m.batch)
-    if (m.views) encoding24_inline.preencode(state, m.views)
+    if (m.batch) encoding24.preencode(state, m.batch)
+    if (m.views) encoding25_inline.preencode(state, m.views)
     if (m.value) c.buffer.preencode(state, m.value)
+    if (m.witness) encoding29_6.preencode(state, m.witness)
+    if (m.attestations) encoding29_7.preencode(state, m.attestations)
   },
   encode(state, m) {
-    let flags = (m.batch ? 1 : 0) | (m.views ? 2 : 0) | (m.optimistic ? 8 : 0) | (m.value ? 16 : 0)
+    let flags =
+      (m.batch ? 1 : 0) |
+      (m.views ? 2 : 0) |
+      (m.optimistic ? 8 : 0) |
+      (m.value ? 16 : 0) |
+      (m.witness ? 32 : 0) |
+      (m.attestations ? 64 : 0)
     if (m.views) {
       flags |= m.views.view ? 4 : 0
     }
 
     c.uint.encode(state, m.timestamp)
-    encoding25_1.encode(state, m.links)
+    encoding29_1.encode(state, m.links)
     c.uint.encode(state, flags)
 
-    if (m.batch) encoding23.encode(state, m.batch)
-    if (m.views) encoding24_inline.encode(state, m.views)
+    if (m.batch) encoding24.encode(state, m.batch)
+    if (m.views) encoding25_inline.encode(state, m.views)
     if (m.value) c.buffer.encode(state, m.value)
+    if (m.witness) encoding29_6.encode(state, m.witness)
+    if (m.attestations) encoding29_7.encode(state, m.attestations)
   },
   decode(state) {
     const v = c.uint.decode(state)
     const r0 = c.uint.decode(state)
-    const r1 = encoding25_1.decode(state)
+    const r1 = encoding29_1.decode(state)
     const flags = c.uint.decode(state)
 
     return {
       version: v,
       timestamp: r0,
       links: r1,
-      batch: (flags & 1) !== 0 ? encoding23.decode(state) : null,
-      views: (flags & 2) !== 0 ? encoding24_inline.decode(state, flags >>> 2) : null,
+      batch: (flags & 1) !== 0 ? encoding24.decode(state) : null,
+      views: (flags & 2) !== 0 ? encoding25_inline.decode(state, flags >>> 2) : null,
       optimistic: (flags & 8) !== 0,
-      value: (flags & 16) !== 0 ? c.buffer.decode(state) : null
+      value: (flags & 16) !== 0 ? c.buffer.decode(state) : null,
+      witness: (flags & 32) !== 0 ? encoding29_6.decode(state) : null,
+      attestations: (flags & 64) !== 0 ? encoding29_7.decode(state) : null
     }
   }
 }
 
 // @autobee/oplog
-const encoding26 = {
+const encoding30 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     switch (m.version) {
@@ -782,7 +917,7 @@ const encoding26 = {
         encoding14.preencode(state, m)
         break
       case 3:
-        encoding25.preencode(state, m)
+        encoding29.preencode(state, m)
         break
       default:
         throw new Error('Unsupported version')
@@ -801,7 +936,7 @@ const encoding26 = {
         encoding14.encode(state, m)
         break
       case 3:
-        encoding25.encode(state, m)
+        encoding29.encode(state, m)
         break
       default:
         throw new Error('Unsupported version')
@@ -825,7 +960,7 @@ const encoding26 = {
         return decoded
       }
       case 3: {
-        const decoded = encoding25.decode(state)
+        const decoded = encoding29.decode(state)
         return decoded
       }
       default:
@@ -835,7 +970,7 @@ const encoding26 = {
 }
 
 // @autobee/manifest-data
-const encoding27 = {
+const encoding31 = {
   preencode(state, m) {
     c.uint.preencode(state, m.version)
     state.end++ // max flag is 2 so always one byte
@@ -869,7 +1004,7 @@ const encoding18_3 = c.array(encoding22)
 // @autobee/system-info-v3.indexers, deferred due to recusive use
 const encoding18_4 = encoding18_3
 // @autobee/oplog-message-v3.links, deferred due to recusive use
-const encoding25_1 = encoding18_3
+const encoding29_1 = encoding18_3
 
 function setVersion(v) {
   version = v
@@ -940,16 +1075,24 @@ function getEncoding(name) {
       return encoding21
     case '@autobee/link':
       return encoding22
-    case '@autobee/batch':
+    case '@autobee/external-batch':
       return encoding23
-    case '@autobee/views':
+    case '@autobee/batch':
       return encoding24
-    case '@autobee/oplog-message-v3':
+    case '@autobee/views':
       return encoding25
-    case '@autobee/oplog':
+    case '@autobee/signed-backer':
       return encoding26
-    case '@autobee/manifest-data':
+    case '@autobee/witness':
       return encoding27
+    case '@autobee/attestation':
+      return encoding28
+    case '@autobee/oplog-message-v3':
+      return encoding29
+    case '@autobee/oplog':
+      return encoding30
+    case '@autobee/manifest-data':
+      return encoding31
     default:
       throw new Error('Encoder not found ' + name)
   }

package/encoding/spec/autobee/schema.json

@@ -476,6 +476,12 @@
           "type": "uint",
           "version": 1
         },
+        {
+          "name": "maxWeight",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
         {
           "name": "length",
           "required": true,
@@ -487,6 +493,24 @@
           "required": true,
           "type": "uint",
           "version": 1
+        },
+        {
+          "name": "isGenesis",
+          "required": false,
+          "type": "bool",
+          "version": 1
+        },
+        {
+          "name": "isAnchor",
+          "required": false,
+          "type": "bool",
+          "version": 1
+        },
+        {
+          "name": "timestamp",
+          "required": false,
+          "type": "int",
+          "version": 1
         }
       ]
     },
@@ -526,6 +550,32 @@
         }
       ]
     },
+    {
+      "name": "external-batch",
+      "namespace": "autobee",
+      "compact": true,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
+        },
+        {
+          "name": "start",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "length",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        }
+      ]
+    },
     {
       "name": "batch",
       "namespace": "autobee",
@@ -553,21 +603,99 @@
       "flagsPosition": 2,
       "fields": [
         {
-          "name": "system",
+          "name": "flushes",
           "required": true,
-          "type": "@autobee/link",
+          "type": "uint",
           "version": 1
         },
         {
-          "name": "flushes",
+          "name": "system",
           "required": true,
-          "type": "uint",
+          "type": "@autobee/external-batch",
           "version": 1
         },
         {
           "name": "view",
           "required": false,
-          "type": "@autobee/link",
+          "type": "@autobee/external-batch",
+          "version": 1
+        }
+      ]
+    },
+    {
+      "name": "signed-backer",
+      "namespace": "autobee",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
+        },
+        {
+          "name": "length",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "signature",
+          "required": true,
+          "type": "fixed64",
+          "version": 1
+        },
+        {
+          "name": "manifest",
+          "required": true,
+          "type": "buffer",
+          "version": 1
+        }
+      ]
+    },
+    {
+      "name": "witness",
+      "namespace": "autobee",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "weight",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "backer",
+          "required": true,
+          "type": "@autobee/signed-backer",
+          "version": 1
+        }
+      ]
+    },
+    {
+      "name": "attestation",
+      "namespace": "autobee",
+      "compact": false,
+      "flagsPosition": -1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
+        },
+        {
+          "name": "weight",
+          "required": true,
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "signature",
+          "required": true,
+          "type": "fixed64",
           "version": 1
         }
       ]
@@ -611,6 +739,17 @@
           "name": "value",
           "type": "buffer",
           "version": 1
+        },
+        {
+          "name": "witness",
+          "type": "@autobee/witness",
+          "version": 1
+        },
+        {
+          "name": "attestations",
+          "array": true,
+          "type": "@autobee/attestation",
+          "version": 1
         }
       ]
     },