Replaces verification hash placeholder with CID

Author: benbierens

codex/manifest/coders.nim

@@ -72,9 +72,9 @@ proc encode*(_: DagPBCoder, manifest: Manifest): ?!seq[byte] =
 
     if manifest.verifiable:
       var verificationInfo = initProtoBuffer()
-      verificationInfo.write(1, manifest.verificationRoot.encode())
+      verificationInfo.write(1, manifest.verificationRoot.data.buffer)
       for slotRoot in manifest.slotRoots:
-        verificationInfo.write(2, slotRoot.encode())
+        verificationInfo.write(2, slotRoot.data.buffer)
       erasureInfo.write(5, verificationInfo)
 
     erasureInfo.finish()
@@ -100,8 +100,8 @@ proc decode*(_: DagPBCoder, data: openArray[byte]): ?!Manifest =
     blockSize: uint32
     originalDatasetSize: uint32
     ecK, ecM: uint32
-    verificationRoot: string
-    slotRoots: seq[string]
+    verificationRoot: seq[byte]
+    slotRoots: seq[seq[byte]]
 
   # Decode `Header` message
   if pbNode.getField(1, pbHeader).isErr:
@@ -176,10 +176,14 @@ proc decode*(_: DagPBCoder, data: openArray[byte]): ?!Manifest =
   ? self.verify()
 
   if verifiable:
+    let
+      verificationRootCid = ? Cid.init(verificationRoot).mapFailure
+      slotRootCids = slotRoots.mapIt(? Cid.init(it).mapFailure)
+
     return Manifest.new(
       manifest = self,
-      verificationRoot = VerificationHash.decode(verificationRoot),
-      slotRoots = slotRoots.mapIt(VerificationHash.decode(it))
+      verificationRoot = verificationRootCid,
+      slotRoots = slotRootCids
     )
 
   self.success

codex/manifest/manifest.nim

@@ -44,8 +44,8 @@ type
       originalDatasetSize: NBytes
       case verifiable {.serialize.}: bool   # Verifiable datasets can be used to generate storage proofs
       of true:
-        verificationRoot: VerificationHash
-        slotRoots: seq[VerificationHash]
+        verificationRoot: Cid
+        slotRoots: seq[Cid]
       else:
         discard
     else:
@@ -97,10 +97,10 @@ proc blocksCount*(self: Manifest): int =
 proc verifiable*(self: Manifest): bool =
   self.verifiable
 
-proc verificationRoot*(self: Manifest): VerificationHash =
+proc verificationRoot*(self: Manifest): Cid =
   self.verificationRoot
 
-proc slotRoots*(self: Manifest): seq[VerificationHash] =
+proc slotRoots*(self: Manifest): seq[Cid] =
   self.slotRoots
 
 ############################################################
@@ -290,8 +290,8 @@ proc new*(
 proc new*(
     T: type Manifest,
     manifest: Manifest,
-    verificationRoot: VerificationHash,
-    slotRoots: seq[VerificationHash]
+    verificationRoot: Cid,
+    slotRoots: seq[Cid]
 ): ?!Manifest =
   ## Create a verifiable dataset from an
   ## protected one

codex/manifest/types.nim

@@ -23,23 +23,8 @@ const
 type
   ManifestCoderType*[codec: static MultiCodec] = object
   DagPBCoder* = ManifestCoderType[multiCodec("dag-pb")]
-  VerificationHash* = int
-  # TODO: Replace this with a wrapper type that supports Poseidon2
-  # and is can be encoded/decoded, AND is JSON-serializable
 
 const
   ManifestContainers* = {
     $DagPBCodec: DagPBCoder()
   }.toTable
-
-proc fromInt*(T: type VerificationHash, value: SomeInteger | SomeUnsignedInt): VerificationHash =
-  value.int
-
-proc encode*(a: VerificationHash): string =
-  $a
-
-proc decode*(T: type VerificationHash, str: string): VerificationHash =
-  try:
-    parseInt(str)
-  except ValueError:
-    0

tests/codex/testmanifest.nim

@@ -26,8 +26,8 @@ checksuite "Manifest":
     )
     verifiableManifest = Manifest.new(
       manifest = protectedManifest,
-      verificationRoot = VerificationHash.fromInt(12),
-      slotRoots = @[VerificationHash.fromInt(23), VerificationHash.fromInt(34)]
+      verificationRoot = Cid.example,
+      slotRoots = @[Cid.example, Cid.example]
     ).tryGet()
 
   proc encodeDecode(manifest: Manifest): Manifest =