hypercore-signing-request 4.0.0 → 4.0.2

package/index.js

@@ -90,7 +90,6 @@ async function generate (core, { length = core.length, fork = core.fork, manifes
   if (core.blobs) return generateDrive(core, { length, fork, manifest })
 
   if (core.core.compat && !manifest) throw new Error('Cannot generate signing requests for compat cores')
-  if (core.fork !== fork) throw new Error('Core should have the same fork')
   if (!manifest) manifest = core.manifest
 
   return c.encode(Request, {
@@ -109,10 +108,7 @@ async function generateDrive (drive, { length = drive.core.length, fork = drive.
   if (!manifest) manifest = drive.core.manifest
   if (manifest < 1) throw new Error('Only v1 manifests are supported')
 
-  const last = await drive.db.getBySeq(length - 1)
-  const { blockOffset, blockLength } = last.value.blob
-
-  const contentLength = blockOffset + blockLength
+  const contentLength = await drive.getBlobsLength(length)
   const content = {
     length: contentLength,
     treeHash: await drive.blobs.core.treeHash(contentLength)
@@ -141,19 +137,21 @@ function decode (buffer) {
 function signable (pub, req) {
   const v = req.manifest.version
 
-  for (const s of req.manifest.signers) {
+  for (let signer = 0; signer < req.manifest.signers.length; signer++) {
+    const s = req.manifest.signers[signer]
     if (!s.publicKey.equals(pub)) continue
 
-    if (req.isHyperdrive) return driveSignable(pub, req)
+    if (req.isHyperdrive) return driveSignable(pub, req, signer)
 
     const signable = caps.treeSignable(v === 0 ? s.namespace : req.key, req.treeHash, req.length, req.fork)
-    return [signable]
+
+    return [{ signer, signable }]
   }
 
   throw new Error('Public key is not a declared signer for this request')
 }
 
-function driveSignable (pub, req) {
+function driveSignable (pub, req, signer) {
   const contentKey = Hyperdrive.getContentKey(req.manifest)
   if (!contentKey) {
     throw new Error('Drive is not compatible, needs v1 manifest')
@@ -163,7 +161,7 @@ function driveSignable (pub, req) {
   const content = caps.treeSignable(contentKey, req.content.treeHash, req.content.length, req.fork)
 
   return [
-    signable,
-    content
+    { signer, signable },
+    { signer, signable: content }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-signing-request",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Generate shareable signing requests for Hypercore",
   "main": "index.js",
   "scripts": {
@@ -12,8 +12,8 @@
   "dependencies": {
     "compact-encoding": "^2.13.0",
     "hypercore": "^10.32.8",
-    "hyperdrive": "^11.7.0",
-    "hypercore-id-encoding": "^1.2.0"
+    "hypercore-id-encoding": "^1.2.0",
+    "hyperdrive": "^11.8.1"
   },
   "repository": {
     "type": "git",