Additional logs

wavesplatform · Jan 16, 2024 · 610c7a9 · 610c7a9
1 parent 8fca554
commit 610c7a9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/node/src/main/scala/com/wavesplatform/mining/Miner.scala b/node/src/main/scala/com/wavesplatform/mining/Miner.scala
@@ -152,7 +152,11 @@ class MinerImpl(
       BlockDiffer
         .createInitialBlockSnapshot(blockchainUpdater, reference, miner)
         .toOption
-        .map(initSnapshot => TxStateSnapshotHashBuilder.createHashFromSnapshot(initSnapshot, None).createHash(prevHash))
+        .map {
+          initSnapshot =>
+            log.info(s"initSnapshot $initSnapshot")
+            TxStateSnapshotHashBuilder.createHashFromSnapshot(initSnapshot, None).createHash(prevHash)
+        }
     }
     log.info(s"keyBlockStateHash = $keyBlockStateHash")
 

diff --git a/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala b/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala
@@ -178,7 +178,15 @@ object BlockDiffer extends ScorexLogging {
         totalRewardPortfolios    <- Portfolio.combine(totalMinerPortfolio, nonMinerRewardPortfolios)
         patchesSnapshot = leasePatchesSnapshot(blockchainWithNewBlock)
         resultSnapshot <- patchesSnapshot.addBalances(totalRewardPortfolios, blockchainWithNewBlock)
-      } yield resultSnapshot
+      } yield {
+        log.info(s"feeFromPreviousBlock = $feeFromPreviousBlock")
+        log.info(s"initialFeeFromThisBlock = $initialFeeFromThisBlock")
+        log.info(s"(minerReward, daoPortfolio, xtnBuybackPortfolio) = ${(minerReward, daoPortfolio, xtnBuybackPortfolio)}")
+        log.info(s"totalRewardPortfolios = $totalRewardPortfolios")
+        log.info(s"patchesSnapshot = $patchesSnapshot")
+        log.info(s"lastBlockId = ${blockchainWithNewBlock.lastBlockId}")
+        resultSnapshot
+      }
 
     for {
       _            <- TracedResult(Either.cond(!verify || block.signatureValid(), (), GenericError(s"Block $block has invalid signature")))
@@ -308,19 +316,28 @@ object BlockDiffer extends ScorexLogging {
       .combine(feeFromPreviousBlock)
       .leftMap(GenericError(_))
       .flatMap { minerReward =>
+        log.info(s"rewardShares.miner = ${rewardShares.miner}")
+        log.info(s"feeFromPreviousBlock = $feeFromPreviousBlock")
+        log.info(s"minerReward = $minerReward")
+
         val resultPf = Map(miner -> minerReward) ++
           daoAddress.map(_ -> Portfolio.waves(rewardShares.daoAddress)) ++
           xtnBuybackAddress.map(_ -> Portfolio.waves(rewardShares.xtnBuybackAddress))
 
+        log.info(s"resultPf = $resultPf")
+        log.info(s"lastBlockId = ${blockchain.lastBlockId}")
+
         StateSnapshot.build(blockchain, portfolios = resultPf.filter(!_._2.isEmpty))
       }
   }
 
   def computeInitialStateHash(blockchain: Blockchain, initSnapshot: StateSnapshot, prevStateHash: ByteStr): ByteStr = {
     if (initSnapshot == StateSnapshot.empty || blockchain.height == 1)
       prevStateHash
-    else
+    else {
+      log.info(s"initSnapshot $initSnapshot")
       TxStateSnapshotHashBuilder.createHashFromSnapshot(initSnapshot, None).createHash(prevStateHash)
+    }
   }
 
   private[this] def apply(