Merge branch 'version-1.5.x' into refactor-network-server

wavesplatform · Jun 11, 2024 · 13f625a · 13f625a
2 parents c85d0cc + fcb9215
commit 13f625a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/node/src/main/scala/com/wavesplatform/network/InvalidBlockStorage.scala b/node/src/main/scala/com/wavesplatform/network/InvalidBlockStorage.scala
@@ -4,6 +4,7 @@ import com.google.common.cache.CacheBuilder
 import com.wavesplatform.common.state.ByteStr
 import com.wavesplatform.lang.ValidationError
 import com.wavesplatform.network.InvalidBlockStorageImpl.*
+import com.wavesplatform.transaction.TxValidationError.BlockFromFuture
 
 import scala.concurrent.duration.FiniteDuration
 
@@ -26,7 +27,11 @@ class InvalidBlockStorageImpl(settings: InvalidBlockStorageSettings) extends Inv
     .expireAfterWrite(settings.timeout.length, settings.timeout.unit)
     .build[ByteStr, ValidationError]()
 
-  override def add(blockId: ByteStr, validationError: ValidationError): Unit = cache.put(blockId, validationError)
+  override def add(blockId: ByteStr, validationError: ValidationError): Unit =
+    validationError match {
+      case _: BlockFromFuture => // ignore because it's a temporary error
+      case _                  => cache.put(blockId, validationError)
+    }
 
   override def find(blockId: ByteStr): Option[ValidationError] = Option(cache.getIfPresent(blockId))
 }