Correct confirmations counting for transactions.

ergoplatform · Jul 25, 2020 · 043e0db · 043e0db
1 parent 2d5e498
commit 043e0db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...i/src/main/scala/org/ergoplatform/explorer/http/api/v0/services/TransactionsService.scala b/...i/src/main/scala/org/ergoplatform/explorer/http/api/v0/services/TransactionsService.scala
@@ -78,7 +78,7 @@ object TransactionsService {
         assets     <- boxIdsNel.toList.flatTraverse(assetRepo.getAllByBoxIds)
         bestHeight <- headerRepo.getBestHeight
         txInfo = txOpt.map(tx =>
-          TransactionSummary(tx, bestHeight - tx.inclusionHeight, ins, outs, assets)
+          TransactionSummary(tx, tx.numConfirmations(bestHeight), ins, outs, assets)
         )
       } yield txInfo) ||> trans.xa
 
@@ -112,7 +112,7 @@ object TransactionsService {
           boxIdsNel  <- OptionT.fromOption[D](outs.map(_.output.boxId).toNel)
           assets     <- OptionT.liftF(assetRepo.getAllByBoxIds(boxIdsNel))
           bestHeight <- OptionT.liftF(headerRepo.getBestHeight)
-          txsWithHeights = txChunk.map(tx => tx -> (bestHeight - tx.inclusionHeight))
+          txsWithHeights = txChunk.map(tx => tx -> tx.numConfirmations(bestHeight))
           txInfo         = TransactionInfo.batch(txsWithHeights, ins, outs, assets)
         } yield txInfo).value.map(_.toList.flatten)
   }

diff --git a/modules/explorer-core/src/main/scala/org/ergoplatform/explorer/db/models/Transaction.scala b/modules/explorer-core/src/main/scala/org/ergoplatform/explorer/db/models/Transaction.scala
@@ -13,4 +13,7 @@ final case class Transaction(
   size: Int, // transaction size in bytes
   index: Int, // index of transaction inside a block
   mainChain: Boolean
-)
+) {
+
+  def numConfirmations(bestHeight: Int): Int = bestHeight - inclusionHeight + 1
+}