Next step to 2.13

Author: Dmitry Voronov

bytes/src/main/scala/io/iohk/ethereum/utils/ByteStringUtils.scala

@@ -49,6 +49,10 @@ object ByteStringUtils {
   }
 
   def concatByteStrings(bse: ByteStringElement*): ByteString = {
+    concatByteStrings(bse.toIterable)
+  }
+
+  def concatByteStrings(bse: Iterable[ByteStringElement]): ByteString = {
     val totalLength = bse.map(_.len).sum
     val result = new Array[Byte](totalLength)
     bse.foldLeft(0)( (i, el) => {

src/ets/scala/io/iohk/ethereum/ets/blockchain/BlockchainSuite.scala

@@ -75,7 +75,7 @@ class BlockchainSuite extends AnyFreeSpec with Matchers with BeforeAndAfterAll w
     runTests(testName, args)
   }
 
-  override def afterAll: Unit = {
+  override def afterAll(): Unit = {
     vm match {
       case extVm: ExtVMInterface => extVm.close()
       case _ =>

src/ets/scala/io/iohk/ethereum/ets/common/ScenarioLoader.scala

@@ -5,7 +5,7 @@ import java.io.File
 import io.iohk.ethereum.utils.Logger
 import org.apache.commons.io.FileUtils
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.io.Source
 
 
@@ -22,7 +22,7 @@ trait ScenarioLoader[T] extends ScenarioParser[T] with Logger {
         None
       else {
         log.info(s"Loading test scenarios from: $file")
-        val text = Source.fromFile(file).getLines.mkString
+        val text = Source.fromFile(file).getLines().mkString
         val scenarios = parse(text)
         Some(ScenarioGroup(name, scenarios))
       }

src/it/scala/io/iohk/ethereum/sync/util/RegularSyncItSpecUtils.scala

@@ -55,7 +55,7 @@ object RegularSyncItSpecUtils {
       system.actorOf(PeersClient.props(etcPeerManager, peerEventBus, testSyncConfig, system.scheduler), "peers-client")
 
     lazy val ledger: Ledger =
-      new LedgerImpl(bl, blockchainConfig, syncConfig, buildEthashConsensus, Scheduler.global)
+      new LedgerImpl(bl, blockchainConfig, syncConfig, buildEthashConsensus(), Scheduler.global)
 
     lazy val ommersPool: ActorRef = system.actorOf(OmmersPool.props(bl, 1), "ommers-pool")
 
@@ -64,7 +64,7 @@ object RegularSyncItSpecUtils {
       "pending-transactions-manager"
     )
 
-    lazy val validators = buildEthashConsensus.validators
+    lazy val validators = buildEthashConsensus().validators
 
     lazy val regularSync = system.actorOf(
       RegularSync.props(

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainActor.scala

@@ -64,7 +64,8 @@ class DumpChainActor(
   var peers: Seq[Peer] = Nil
 
   override def preStart(): Unit = {
-    context.system.scheduler.scheduleOnce(4 seconds, () => peerManager ! GetPeers)
+    val r: Runnable = () => peerManager ! GetPeers
+    context.system.scheduler.scheduleOnce(4 seconds, r)
   }
 
   //Periodically try to connect to bootstrap peer in case the connection failed before dump termination

src/main/scala/io/iohk/ethereum/BootstrapDownload.scala

@@ -47,7 +47,7 @@ object BootstrapDownload extends Logger {
       try {
         val buffer = new Array[Byte](bufferSize)
 
-        Stream.continually(dis.read(buffer)).takeWhile(_ != -1).foreach(out.write(buffer, 0, _))
+        Iterator.continually(dis.read(buffer)).takeWhile(_ != -1).foreach(out.write(buffer, 0, _))
       } finally (out.close())
       Hex.toHexString(sha512.digest)
 
@@ -62,7 +62,7 @@ object BootstrapDownload extends Logger {
     try {
       val zis = new ZipInputStream(in)
       try {
-        Stream.continually(zis.getNextEntry).takeWhile(_ != null).foreach { file =>
+        Iterator.continually(zis.getNextEntry).takeWhile(_ != null).foreach { file =>
           if (!file.isDirectory) {
             val outPath = destination.resolve(file.getName)
             val outPathParent = outPath.getParent
@@ -74,7 +74,7 @@ object BootstrapDownload extends Logger {
             val out = new FileOutputStream(outFile)
             try {
               val buffer = new Array[Byte](bufferSize)
-              Stream.continually(zis.read(buffer)).takeWhile(_ != -1).foreach(out.write(buffer, 0, _))
+              Iterator.continually(zis.read(buffer)).takeWhile(_ != -1).foreach(out.write(buffer, 0, _))
             } finally (out.close())
           }
         }

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/ReceiptsValidator.scala

@@ -27,11 +27,19 @@ trait ReceiptsValidator {
       blockchain.getBlockHeaderByHash(hash) -> blockReceipts
     }
 
-    val receiptsValidationError = blockHeadersWithReceipts.collectFirst {
-      case (Some(header), receipt) if validators.blockValidator.validateBlockAndReceipts(header, receipt).isLeft =>
-        Invalid(validators.blockValidator.validateBlockAndReceipts(header, receipt).left.get)
-      case (None, _) => DbError
+    val errorIterator = blockHeadersWithReceipts.iterator.map {
+      case (Some(header), receipt) =>
+        validators.blockValidator.validateBlockAndReceipts(header, receipt) match {
+          case Left(err) => Some(Invalid(err))
+          case _         => None
+        }
+      case (None, _) => Some(DbError)
     }
+
+    val receiptsValidationError = errorIterator.collectFirst {
+      case Some(error) => error
+    }
+
     receiptsValidationError.getOrElse(Valid(blockHashesWithReceipts))
   }
 

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/SyncStateScheduler.scala

@@ -13,6 +13,7 @@ import io.vavr.collection.PriorityQueue
 import monix.eval.Task
 
 import scala.annotation.tailrec
+import scala.collection.immutable.ArraySeq
 import scala.util.Try
 
 /**
@@ -209,7 +210,8 @@ class SyncStateScheduler(blockchain: Blockchain, bloomFilter: LoadableBloomFilte
       }
 
     case n: BranchNode =>
-      Right(n.children.collect { case HashNode(childHash) =>
+      val children = ArraySeq.unsafeWrapArray(n.children)
+      Right(children.collect { case HashNode(childHash) =>
         StateNodeRequest(
           ByteString.fromArrayUnsafe(childHash),
           None,

src/main/scala/io/iohk/ethereum/cli/CliLauncher.scala

@@ -2,10 +2,13 @@ package io.iohk.ethereum.cli
 
 import com.monovore.decline._
 
+import scala.collection.immutable.ArraySeq
+
 //scalastyle:off
 object CliLauncher extends App {
 
-  CliCommands.api.map(println).parse(PlatformApp.ambientArgs getOrElse args, sys.env) match {
+  private val arguments: Seq[String] = PlatformApp.ambientArgs getOrElse ArraySeq.unsafeWrapArray(args)
+  CliCommands.api.map(println).parse(arguments, sys.env) match {
     case Left(help) => System.err.println(help)
     case Right(_) => ()
   }

src/main/scala/io/iohk/ethereum/consensus/ethash/EthashMiner.scala

@@ -179,7 +179,7 @@ class EthashMiner(
     // scalastyle:off magic.number
     val initNonce = BigInt(64, new Random())
 
-    (0 to numRounds).toStream
+    (0 to numRounds).iterator
       .map { n =>
         val nonce = (initNonce + n) % MaxNonce
         val nonceBytes = ByteUtils.padLeft(ByteString(nonce.toUnsignedByteArray), 8)

src/main/scala/io/iohk/ethereum/consensus/validators/std/StdValidators.scala

@@ -87,9 +87,11 @@ object StdValidators {
     else if (header.stateRoot != stateRootHash)
       Left(ValidationAfterExecError(s"Block has invalid state root hash, expected ${Hex
         .toHexString(header.stateRoot.toArray)} but got ${Hex.toHexString(stateRootHash.toArray)}"))
-    else if (blockAndReceiptsValidation.isLeft)
-      Left(ValidationAfterExecError(blockAndReceiptsValidation.left.get.toString))
-    else
-      Right(BlockExecutionSuccess)
+    else {
+      blockAndReceiptsValidation match {
+        case Left(err) => Left(ValidationAfterExecError(err.toString))
+        case _ => Right(BlockExecutionSuccess)
+      }
+    }
   }
 }

src/main/scala/io/iohk/ethereum/db/cache/LruCache.scala

@@ -31,7 +31,7 @@ class LruCache[K <: AnyRef, V <: AnyRef](
   }
 
   override def getValues: Seq[(K, V)] = {
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
     lruCache.asMap().asScala.toSeq
   }
 

src/main/scala/io/iohk/ethereum/db/dataSource/DataSourceBatchUpdate.scala

@@ -1,5 +1,7 @@
 package io.iohk.ethereum.db.dataSource
 
+import scala.collection.compat.immutable.ArraySeq
+
 case class DataSourceBatchUpdate(dataSource: DataSource, updates: Array[DataUpdate] = Array.empty) {
 
   def and(that: DataSourceBatchUpdate): DataSourceBatchUpdate = {
@@ -11,7 +13,7 @@ case class DataSourceBatchUpdate(dataSource: DataSource, updates: Array[DataUpda
   }
 
   def commit(): Unit = {
-    dataSource.update(updates)
+    dataSource.update(ArraySeq.unsafeWrapArray(updates))
   }
 
 }

src/main/scala/io/iohk/ethereum/db/dataSource/RocksDbDataSource.scala

@@ -1,6 +1,7 @@
 package io.iohk.ethereum.db.dataSource
 
 import java.util.concurrent.locks.ReentrantReadWriteLock
+
 import io.iohk.ethereum.utils.Logger
 import cats.effect.Resource
 import io.iohk.ethereum.db.dataSource.DataSource._
@@ -10,6 +11,7 @@ import monix.eval.Task
 import monix.reactive.Observable
 import org.rocksdb._
 
+import scala.collection.compat.immutable.ArraySeq
 import scala.collection.mutable
 import scala.util.control.NonFatal
 
@@ -38,7 +40,8 @@ class RocksDbDataSource(
     dbLock.readLock().lock()
     try {
       assureNotClosed()
-      Option(db.get(handles(namespace), readOptions, key.toArray))
+      val byteArray = db.get(handles(namespace), readOptions, key.toArray)
+      Option(ArraySeq.unsafeWrapArray(byteArray))
     } catch {
       case error: RocksDbDataSourceClosedException =>
         throw error
@@ -269,7 +272,7 @@ object RocksDbDataSource {
       namespaces: Seq[Namespace]
   ): (RocksDB, mutable.Buffer[ColumnFamilyHandle], ReadOptions, DBOptions, ColumnFamilyOptions) = {
     import rocksDbConfig._
-    import scala.collection.JavaConverters._
+    import scala.jdk.CollectionConverters._
 
     RocksDB.loadLibrary()
 

src/main/scala/io/iohk/ethereum/db/storage/AppStateStorage.scala

@@ -5,6 +5,8 @@ import java.math.BigInteger
 import io.iohk.ethereum.db.dataSource.{DataSource, DataSourceBatchUpdate}
 import io.iohk.ethereum.db.storage.AppStateStorage._
 
+import scala.collection.compat.immutable.ArraySeq
+
 /**
   * This class is used to store app state variables
   *   Key: see AppStateStorage.Keys
@@ -13,10 +15,10 @@ import io.iohk.ethereum.db.storage.AppStateStorage._
 class AppStateStorage(val dataSource: DataSource) extends TransactionalKeyValueStorage[Key, Value] {
 
   val namespace: IndexedSeq[Byte] = Namespaces.AppStateNamespace
-  def keySerializer: Key => IndexedSeq[Byte] = _.getBytes(StorageStringCharset.UTF8Charset)
+  def keySerializer: Key => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
 
   def keyDeserializer: IndexedSeq[Byte] => Key = k => new String(k.toArray, StorageStringCharset.UTF8Charset)
-  def valueSerializer: String => IndexedSeq[Byte] = _.getBytes(StorageStringCharset.UTF8Charset)
+  def valueSerializer: String => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
   def valueDeserializer: IndexedSeq[Byte] => String = (valueBytes: IndexedSeq[Byte]) =>
     new String(valueBytes.toArray, StorageStringCharset.UTF8Charset)
 

src/main/scala/io/iohk/ethereum/db/storage/BlockNumberMappingStorage.scala

@@ -6,11 +6,13 @@ import akka.util.ByteString
 import io.iohk.ethereum.db.dataSource.DataSource
 import io.iohk.ethereum.db.storage.BlockHeadersStorage.BlockHeaderHash
 
+import scala.collection.immutable.ArraySeq
+
 class BlockNumberMappingStorage(val dataSource: DataSource)
     extends TransactionalKeyValueStorage[BigInt, BlockHeaderHash] {
   override val namespace: IndexedSeq[Byte] = Namespaces.HeightsNamespace
 
-  override def keySerializer: (BigInt) => IndexedSeq[Byte] = index => index.toByteArray
+  override def keySerializer: (BigInt) => IndexedSeq[Byte] = index => ArraySeq.unsafeWrapArray( index.toByteArray )
 
   override def keyDeserializer: IndexedSeq[Byte] => BigInt = bytes => new BigInt(new BigInteger(bytes.toArray))
 

src/main/scala/io/iohk/ethereum/db/storage/FastSyncStateStorage.scala

@@ -9,6 +9,8 @@ import io.iohk.ethereum.blockchain.sync.fast.FastSync._
 import io.iohk.ethereum.db.dataSource.DataSource
 import io.iohk.ethereum.utils.ByteUtils.compactPickledBytes
 
+import scala.collection.compat.immutable.ArraySeq
+
 object FastSyncStateStorage {
 
   val syncStateKey: String = "fast-sync-state"
@@ -33,7 +35,7 @@ class FastSyncStateStorage(val dataSource: DataSource)
       .addConcreteType[EvmCodeHash]
       .addConcreteType[StorageRootHash]
 
-  override def keySerializer: String => IndexedSeq[Byte] = _.getBytes(StorageStringCharset.UTF8Charset)
+  override def keySerializer: String => IndexedSeq[Byte] = k => ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
 
   override def keyDeserializer: IndexedSeq[Byte] => String = b =>
     new String(b.toArray, StorageStringCharset.UTF8Charset)

src/main/scala/io/iohk/ethereum/db/storage/KeyValueStorage.scala

@@ -5,6 +5,8 @@ import io.iohk.ethereum.db.dataSource.RocksDbDataSource.IterationError
 import io.iohk.ethereum.db.dataSource.{DataSource, DataSourceUpdate}
 import monix.reactive.Observable
 
+import scala.collection.immutable.ArraySeq
+
 trait KeyValueStorage[K, V, T <: KeyValueStorage[K, V, T]] extends SimpleMap[K, V, T] {
 
   val dataSource: DataSource
@@ -48,7 +50,11 @@ trait KeyValueStorage[K, V, T <: KeyValueStorage[K, V, T]] extends SimpleMap[K,
 
   def storageContent: Observable[Either[IterationError, (K, V)]] = {
     dataSource.iterate(namespace).map { result =>
-      result.map { case (key, value) => (keyDeserializer(key.toIndexedSeq), valueDeserializer(value)) }
+      result.map { case (key, value) =>
+        val kseq = keyDeserializer(ArraySeq.unsafeWrapArray(key))
+        val vseq = valueDeserializer(ArraySeq.unsafeWrapArray(value))
+        (kseq, vseq)
+      }
     }
   }
 }

src/main/scala/io/iohk/ethereum/db/storage/KnownNodesStorage.scala

@@ -4,6 +4,8 @@ import java.net.URI
 
 import io.iohk.ethereum.db.dataSource.{DataSource, DataSourceBatchUpdate}
 
+import scala.collection.immutable.ArraySeq
+
 /**
   * This class is used to store discovered nodes
   *   Value: stored nodes list
@@ -12,9 +14,19 @@ class KnownNodesStorage(val dataSource: DataSource) extends TransactionalKeyValu
   val key = "KnownNodes"
 
   val namespace: IndexedSeq[Byte] = Namespaces.KnownNodesNamespace
-  def keySerializer: String => IndexedSeq[Byte] = _.getBytes(StorageStringCharset.UTF8Charset)
-  def keyDeserializer: IndexedSeq[Byte] => String = k => new String(k.toArray, StorageStringCharset.UTF8Charset)
-  def valueSerializer: Set[String] => IndexedSeq[Byte] = _.mkString(" ").getBytes(StorageStringCharset.UTF8Charset)
+
+  def keySerializer: String => IndexedSeq[Byte] = k => {
+    ArraySeq.unsafeWrapArray(k.getBytes(StorageStringCharset.UTF8Charset))
+  }
+
+  def keyDeserializer: IndexedSeq[Byte] => String = k => {
+    new String(k.toArray, StorageStringCharset.UTF8Charset)
+  }
+
+  def valueSerializer: Set[String] => IndexedSeq[Byte] = k => {
+    ArraySeq.unsafeWrapArray(k.mkString(" ").getBytes(StorageStringCharset.UTF8Charset))
+  }
+
   def valueDeserializer: IndexedSeq[Byte] => Set[String] = (valueBytes: IndexedSeq[Byte]) =>
     new String(valueBytes.toArray, StorageStringCharset.UTF8Charset).split(' ').toSet
 

src/main/scala/io/iohk/ethereum/db/storage/TransactionalKeyValueStorage.scala

@@ -4,6 +4,8 @@ import io.iohk.ethereum.db.dataSource.RocksDbDataSource.IterationError
 import io.iohk.ethereum.db.dataSource.{DataSource, DataSourceBatchUpdate, DataSourceUpdate}
 import monix.reactive.Observable
 
+import scala.collection.immutable.ArraySeq
+
 /**
   * Represents transactional key value storage mapping keys of type K to values of type V
   * Note: all methods methods that perform updates return [[io.iohk.ethereum.db.dataSource.DataSourceBatchUpdate]]
@@ -56,7 +58,10 @@ trait TransactionalKeyValueStorage[K, V] {
 
   def storageContent: Observable[Either[IterationError, (K, V)]] = {
     dataSource.iterate(namespace).map { result =>
-      result.map { case (key, value) => (keyDeserializer(key.toIndexedSeq), valueDeserializer(value)) }
+      result.map { case (key, value) =>
+        val kseq = keyDeserializer(ArraySeq.unsafeWrapArray(key))
+        val vseq = valueDeserializer(ArraySeq.unsafeWrapArray(value))
+        (kseq, vseq) }
     }
   }
 }

src/main/scala/io/iohk/ethereum/extvm/VMClient.scala

@@ -88,6 +88,10 @@ class VMClient(externalVmConfig: VmConfig.ExternalConfig, messageHandler: Messag
       case Query.Empty =>
         log.debug("Client received msg: Empty")
         messageLoop[W, S](world)
+
+      case _ =>
+        log.debug("Client received unknown msg!")
+        messageLoop[W, S](world)
     }
   }