server: added different codec for blocks.

wiringbits · Aug 25, 2020 · 0738aa1 · 0738aa1
1 parent 3a5ca78
commit 0738aa1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/server/app/com/xsn/explorer/models/persisted/BlockHeader.scala b/server/app/com/xsn/explorer/models/persisted/BlockHeader.scala
@@ -99,6 +99,18 @@ object BlockHeader {
       "nonce" -> obj.nonce,
       "bits" -> obj.bits,
       "filter" -> filterMaybe,
+      "difficulty" -> obj.difficulty
+    )
+  }
+
+  val blockWrites: Writes[BlockHeader] = (obj: BlockHeader) => {
+    Json.obj(
+      "hash" -> obj.hash,
+      "previousBlockhash" -> obj.previousBlockhash,
+      "nextBlockhash" -> obj.nextBlockhash,
+      "merkleRoot" -> obj.merkleRoot,
+      "height" -> obj.height,
+      "time" -> obj.time,
       "difficulty" -> obj.difficulty,
       "transactions" -> obj.transactions
     )

diff --git a/server/app/controllers/BlocksController.scala b/server/app/controllers/BlocksController.scala
@@ -33,7 +33,7 @@ class BlocksController @Inject()(
   }
 
   def getBlocks(lastSeenHash: Option[String], limit: Int, orderingCondition: String) = public { _ =>
-    implicit val codec: Writes[BlockHeader] = BlockHeader.partialWrites
+    implicit val codec: Writes[BlockHeader] = BlockHeader.blockWrites
     blockService
       .getBlocks(Limit(limit), lastSeenHash, orderingCondition)
       .toFutureOr