Fixed VRF value at current height (#3474)

wavesplatform · May 13, 2021 · 8b44f02 · 8b44f02
1 parent cba985f
commit 8b44f02
Show file tree

Hide file tree

Showing 23 changed files with 230 additions and 621 deletions.
diff --git a/grpc-server/src/main/scala/com/wavesplatform/events/events.scala b/grpc-server/src/main/scala/com/wavesplatform/events/events.scala
@@ -350,7 +350,7 @@ object StateUpdate {
 
   def atomic(blockchainBeforeWithMinerReward: Blockchain, diff: Diff): StateUpdate = {
     val blockchain      = blockchainBeforeWithMinerReward
-    val blockchainAfter = CompositeBlockchain(blockchain, Some(diff))
+    val blockchainAfter = CompositeBlockchain(blockchain, diff)
 
     val PortfolioUpdates(updatedBalances, updatedLeaseBalances) = DiffToStateApplier.portfolios(blockchain, diff)
 
@@ -484,11 +484,11 @@ object StateUpdate {
       .foldLeft((Seq.empty[StateUpdate], parentDiff)) {
         case ((updates, accDiff), txDiff) =>
           (
-            updates :+ atomic(CompositeBlockchain(blockchainBeforeWithMinerReward, Some(accDiff)), txDiff),
+            updates :+ atomic(CompositeBlockchain(blockchainBeforeWithMinerReward, accDiff), txDiff),
             accDiff.combine(txDiff)
           )
       }
-    val blockchainAfter = CompositeBlockchain(blockchainBeforeWithMinerReward, Some(totalDiff))
+    val blockchainAfter = CompositeBlockchain(blockchainBeforeWithMinerReward, totalDiff)
     val metadata        = transactionsMetadata(blockchainAfter, totalDiff)
     val refAssets       = referencedAssets(blockchainAfter, txsStateUpdates)
     (parentStateUpdateWithMinerReward, txsStateUpdates, metadata, refAssets)

diff --git a/grpc-server/src/test/scala/com/wavesplatform/events/BlockchainUpdateTriggersSpec.scala b/grpc-server/src/test/scala/com/wavesplatform/events/BlockchainUpdateTriggersSpec.scala
diff --git a/grpc-server/src/test/scala/com/wavesplatform/events/EventsHelpers.scala b/grpc-server/src/test/scala/com/wavesplatform/events/EventsHelpers.scala