Adjust content id derivation to differentiate body and receipts

Author: kdeme

portal/network/history/content/content_keys.nim

@@ -87,7 +87,7 @@ const
   OFFSET_BITS = 256 - CYCLE_BITS # 240
   REVERSED_OFFSET_BITS = 64 - CYCLE_BITS # 48
 
-func toContentId*(blockNumber: uint64): UInt256 =
+func toContentId*(blockNumber: uint64, contentType: ContentType): UInt256 =
   ## Returns the content id for a given block number
   let
     cycleBits = blockNumber mod (1'u64 shl CYCLE_BITS)
@@ -96,16 +96,17 @@ func toContentId*(blockNumber: uint64): UInt256 =
     reversedOffsetBits = reverseBits(offsetBits, REVERSED_OFFSET_BITS)
 
   (cycleBits.stuint(256) shl OFFSET_BITS) or
-    (reversedOffsetBits.stuint(256) shl (OFFSET_BITS - REVERSED_OFFSET_BITS))
+    (reversedOffsetBits.stuint(256) shl (OFFSET_BITS - REVERSED_OFFSET_BITS)) or
+    ord(contentType).stuint(256)
 
 func toContentId*(contentKey: ContentKey): ContentId =
   case contentKey.contentType
   of unused:
     raiseAssert "ContentKey may not have unused value as content type"
   of blockBody:
-    toContentId(contentKey.blockBodyKey.blockNumber)
+    toContentId(contentKey.blockBodyKey.blockNumber, contentKey.contentType)
   of receipts:
-    toContentId(contentKey.receiptsKey.blockNumber)
+    toContentId(contentKey.receiptsKey.blockNumber, contentKey.contentType)
 
 func toContentId*(bytes: ContentKeyByteList): Opt[ContentId] =
   let contentKey = ?bytes.decode()

portal/tests/history_network_tests/test_history_content_keys.nim

@@ -27,20 +27,20 @@ suite "History Content Keys":
 
     # Output
     const contentIds = [
-      "0001000000000000000000000000000000000000000000000000000000000000",
-      "03e8000000000000000000000000000000000000000000000000000000000000",
-      "614e3d0000000000000000000000000000000000000000000000000000000000",
-      "ffffffffffffffff000000000000000000000000000000000000000000000000",
-      "fffeffffffffffff000000000000000000000000000000000000000000000000",
-      "fffffffffffffffe000000000000000000000000000000000000000000000000",
-      "0000000000000008000000000000000000000000000000000000000000000000",
-      "5555aaaaaaaaaaaa000000000000000000000000000000000000000000000000",
-      "aaaa555555555555000000000000000000000000000000000000000000000000",
-      "a0a0050505050505000000000000000000000000000000000000000000000000",
+      "0001000000000000000000000000000000000000000000000000000000000009",
+      "03e8000000000000000000000000000000000000000000000000000000000009",
+      "614e3d0000000000000000000000000000000000000000000000000000000009",
+      "ffffffffffffffff000000000000000000000000000000000000000000000009",
+      "fffeffffffffffff000000000000000000000000000000000000000000000009",
+      "fffffffffffffffe000000000000000000000000000000000000000000000009",
+      "0000000000000008000000000000000000000000000000000000000000000009",
+      "5555aaaaaaaaaaaa000000000000000000000000000000000000000000000009",
+      "aaaa555555555555000000000000000000000000000000000000000000000009",
+      "a0a0050505050505000000000000000000000000000000000000000000000009",
     ]
 
     for i in 0 ..< blockNumbers.len():
-      let contentId = toContentId(blockNumbers[i])
+      let contentId = toContentId(blockNumbers[i], ContentType.blockBody)
 
       check contentIds[i] == contentId.dumpHex()
 
@@ -52,10 +52,10 @@ suite "History Content Keys":
     const
       contentKeyHex = "0x094e61bc0000000000"
       contentId =
-        "44012581390156707874310974263613699127815223388818970640389075388176810377216"
+        "44012581390156707874310974263613699127815223388818970640389075388176810377225"
       # or
       contentIdHexBE =
-        "614e3d0000000000000000000000000000000000000000000000000000000000"
+        "614e3d0000000000000000000000000000000000000000000000000000000009"
 
     let contentKey = blockBodyContentKey(blockNumber)
 
@@ -81,10 +81,10 @@ suite "History Content Keys":
     const
       contentKeyHex = "0x0a4e61bc0000000000"
       contentId =
-        "44012581390156707874310974263613699127815223388818970640389075388176810377216"
+        "44012581390156707874310974263613699127815223388818970640389075388176810377226"
       # or
       contentIdHexBE =
-        "614e3d0000000000000000000000000000000000000000000000000000000000"
+        "614e3d000000000000000000000000000000000000000000000000000000000a"
 
     let contentKey = receiptsContentKey(blockNumber)