Merge branch 'version-1.4.x' into remove-guava-from-lang

wavesplatform · Oct 20, 2023 · f5f2431 · f5f2431
2 parents 50c6c5e + e311af4
commit f5f2431
Show file tree

Hide file tree

Showing 3 changed files with 260 additions and 33 deletions.
diff --git a/node/src/main/scala/com/wavesplatform/database/Caches.scala b/node/src/main/scala/com/wavesplatform/database/Caches.scala
@@ -1,6 +1,5 @@
 package com.wavesplatform.database
 
-import java.util
 import cats.data.Ior
 import cats.syntax.monoid.*
 import cats.syntax.option.*
@@ -20,6 +19,7 @@ import com.wavesplatform.transaction.{Asset, Transaction}
 import com.wavesplatform.utils.ObservedLoadingCache
 import monix.reactive.Observer
 
+import java.util
 import scala.collection.immutable.VectorMap
 import scala.concurrent.duration.*
 import scala.jdk.CollectionConverters.*
@@ -152,6 +152,7 @@ abstract class Caches(spendableBalanceChanged: Observer[(Address, Asset)]) exten
   protected def loadApprovedFeatures(): Map[Short, Int]
   override def approvedFeatures: Map[Short, Int] = approvedFeaturesCache
 
+  // Also contains features those will be activated in the future (activationHeight > currentHeight), because they were approved now or before.
   @volatile
   protected var activatedFeaturesCache: Map[Short, Int] = loadActivatedFeatures()
   protected def loadActivatedFeatures(): Map[Short, Int]

diff --git a/node/src/main/scala/com/wavesplatform/database/LevelDBWriter.scala b/node/src/main/scala/com/wavesplatform/database/LevelDBWriter.scala
@@ -530,10 +530,10 @@ abstract class LevelDBWriter private[database] (
           }
 
         if (newlyApprovedFeatures.nonEmpty) {
-          approvedFeaturesCache = newlyApprovedFeatures ++ rw.get(Keys.approvedFeatures)
+          approvedFeaturesCache = newlyApprovedFeatures ++ approvedFeaturesCache
           rw.put(Keys.approvedFeatures, approvedFeaturesCache)
 
-          val featuresToSave = (newlyApprovedFeatures.view.mapValues(_ + activationWindowSize) ++ rw.get(Keys.activatedFeatures)).toMap
+          val featuresToSave = (newlyApprovedFeatures.view.mapValues(_ + activationWindowSize) ++ activatedFeaturesCache).toMap
 
           activatedFeaturesCache = featuresToSave ++ settings.functionalitySettings.preActivatedFeatures
           rw.put(Keys.activatedFeatures, featuresToSave)
@@ -750,6 +750,15 @@ abstract class LevelDBWriter private[database] (
             disabledAliases = DisableHijackedAliases.revert(rw)
           }
 
+          val disapprovedFeatures = approvedFeaturesCache.collect { case (id, approvalHeight) if approvalHeight > targetHeight => id }
+          if (disapprovedFeatures.nonEmpty) {
+            approvedFeaturesCache --= disapprovedFeatures
+            rw.put(Keys.approvedFeatures, approvedFeaturesCache)
+
+            activatedFeaturesCache --= disapprovedFeatures // We won't activate them in the future
+            rw.put(Keys.activatedFeatures, activatedFeaturesCache)
+          }
+
           val hitSource = rw.get(Keys.hitSource(currentHeight)).get
           val block     = createBlock(discardedMeta.header, discardedMeta.signature, loadTransactions(currentHeight, rw).map(_._2)).explicitGet()