[ETCM-129] - starting point of migration

Author: Dmitry Voronov

build.sbt

@@ -16,6 +16,7 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
   version := "3.2.1",
   scalaVersion := "2.13.4",
   // Scalanet snapshots are published to Sonatype after each build.
+  resolvers += Resolver.mavenLocal,
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
   testOptions in Test += Tests
     .Argument(TestFrameworks.ScalaTest, "-l", "EthashMinerSpec"), // miner tests disabled by default,
@@ -24,10 +25,6 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
     "-deprecation",
     "-feature",
     "-Xfatal-warnings",
-//    "-Xlint:unsound-match",
-//    "-Ywarn-inaccessible",
-//    "-Ywarn-unused-import",
-//    "-Ypartial-unification",
     "-encoding",
     "utf-8"
   ),

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

@@ -9,4 +9,54 @@ object ByteStringUtils {
   // unsafe
   def string2hash(hash: String): ByteString =
     ByteString(Hex.decode(hash))
+
+
+  implicit class Padding(val bs: ByteString) extends AnyVal {
+    def padToByteString(length: Int, b: Byte): ByteString = {
+      if (length <= bs.length) bs else {
+        val len = Math.max(bs.length, length)
+        val result = new Array[Byte](len)
+        bs.copyToArray(result, 0)
+        var i = bs.length
+        while (i < len) {
+          result.update(i, b)
+          i += 1
+        }
+        ByteString.fromArray(result)
+      }
+    }
+  }
+
+
+  sealed trait ByteStringElement {
+    def len: Int
+    def asByteArray: Array[Byte]
+  }
+
+  implicit class ByteStringSelfElement(val bs: ByteString) extends ByteStringElement {
+    def len: Int = bs.length
+    def asByteArray: Array[Byte] = bs.toArray
+  }
+
+  implicit class ByteStringArrayElement(val ar: Array[Byte]) extends ByteStringElement {
+    def len: Int = ar.length
+    def asByteArray: Array[Byte] = ar
+  }
+
+  implicit class ByteStringByteElement(val b: Byte) extends ByteStringElement {
+    def len: Int = 1
+    def asByteArray: Array[Byte] = Array(b)
+  }
+
+  def concatByteStrings(bse: ByteStringElement*): ByteString = {
+    val totalLength = bse.map(_.len).sum
+    val result = new Array[Byte](totalLength)
+    bse.foldLeft(0)( (i, el) => {
+      val arr = el.asByteArray
+      System.arraycopy(arr, 0, result, i, el.len)
+      i + el.len
+    })
+    ByteString.fromArray(result)
+  }
+
 }

project/Dependencies.scala

@@ -80,7 +80,7 @@ object Dependencies {
   )
 
   val network: Seq[ModuleID] = {
-    val scalanetVersion = "0.4.4-SNAPSHOT"
+    val scalanetVersion = "0.5.1-SNAPSHOT"
     Seq(
       "io.iohk" %% "scalanet" % scalanetVersion,
       "io.iohk" %% "scalanet-discovery" % scalanetVersion

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

@@ -46,6 +46,7 @@ object BootstrapDownload extends Logger {
       val out = new FileOutputStream(outFile)
       try {
         val buffer = new Array[Byte](bufferSize)
+
         Stream.continually(dis.read(buffer)).takeWhile(_ != -1).foreach(out.write(buffer, 0, _))
       } finally (out.close())
       Hex.toHexString(sha512.digest)

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

@@ -126,7 +126,7 @@ class FastSync(
     private var requestedBlockBodies: Map[ActorRef, Seq[ByteString]] = Map.empty
     private var requestedReceipts: Map[ActorRef, Seq[ByteString]] = Map.empty
 
-    private val syncStateStorageActor = context.actorOf(Props[StateStorageActor], "state-storage")
+    private val syncStateStorageActor = context.actorOf(Props[StateStorageActor](), "state-storage")
 
     syncStateStorageActor ! fastSyncStateStorage
 

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

@@ -1,7 +1,6 @@
 package io.iohk.ethereum.db.cache
 
 import io.iohk.ethereum.common.SimpleMap
-import scala.collection.Seq
 
 trait Cache[K, V] extends SimpleMap[K, V, Cache[K, V]] {
   def getValues: Seq[(K, V)]

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

@@ -4,8 +4,7 @@ import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 
 import io.iohk.ethereum.utils.Config.NodeCacheConfig
-
-import scala.collection.{Seq, mutable}
+import scala.collection.mutable
 import scala.concurrent.duration.FiniteDuration
 
 //TODO EC-492 Investigate more carefully possibility of having read cache in front of db
@@ -34,7 +33,7 @@ class MapCache[K, V](val cache: mutable.Map[K, V], config: NodeCacheConfig) exte
     }
   }
 
-  override def clear: Unit = {
+  override def clear(): Unit = {
     lastClear.getAndSet(System.nanoTime())
     cache.clear()
   }

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

@@ -2,7 +2,7 @@ package io.iohk.ethereum.db.storage
 
 import io.iohk.ethereum.common.SimpleMap
 import io.iohk.ethereum.db.cache.Cache
-import scala.collection._
+//import scala.collection._
 
 trait CachedKeyValueStorage[K, V, T <: CachedKeyValueStorage[K, V, T]] extends SimpleMap[K, V, T] {
   type I <: KeyValueStorage[K, V, I]

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

@@ -21,7 +21,7 @@ trait StateStorage {
   def onBlockSave(bn: BigInt, currentBestSavedBlock: BigInt)(updateBestBlocksData: () => Unit): Unit
   def onBlockRollback(bn: BigInt, currentBestSavedBlock: BigInt)(updateBestBlocksData: () => Unit): Unit
 
-  def saveNode(nodeHash: NodeHash, nodeEncoded: NodeEncoded, bn: BigInt)
+  def saveNode(nodeHash: NodeHash, nodeEncoded: NodeEncoded, bn: BigInt): Unit
   def getNode(nodeHash: NodeHash): Option[MptNode]
   def forcePersist(reason: FlushSituation): Boolean
 }

src/main/scala/io/iohk/ethereum/db/storage/pruning/package.scala

@@ -14,13 +14,13 @@ package object pruning {
       * @param blockNumber BlockNumber to prune
       * @param nodeStorage NodeStorage
       */
-    def prune(blockNumber: BigInt, nodeStorage: NodesStorage, inMemory: Boolean)
+    def prune(blockNumber: BigInt, nodeStorage: NodesStorage, inMemory: Boolean): Unit
 
     /**
       * Rollbacks blocknumber changes
       * @param blockNumber BlockNumber to rollback
       * @param nodeStorage NodeStorage
       */
-    def rollback(blockNumber: BigInt, nodeStorage: NodesStorage, inMemory: Boolean)
+    def rollback(blockNumber: BigInt, nodeStorage: NodesStorage, inMemory: Boolean): Unit
   }
 }

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

@@ -4,9 +4,9 @@ import java.math.BigInteger
 
 import akka.stream.scaladsl.{SinkQueueWithCancel, SourceQueueWithComplete}
 import akka.util.ByteString
-import com.google.protobuf.CodedInputStream
-import com.trueaccord.scalapb.{GeneratedMessage, GeneratedMessageCompanion, LiteParser, Message}
+import com.google.protobuf.{CodedInputStream, Message}
 import org.bouncycastle.util.BigIntegers
+import scalapb.{GeneratedMessage, GeneratedMessageCompanion, LiteParser}
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
@@ -24,9 +24,9 @@ class MessageHandler(in: SinkQueueWithCancel[ByteString], out: SourceQueueWithCo
     out offer (lengthBytes ++ ByteString(bytes))
   }
 
-  def awaitMessage[M <: GeneratedMessage with Message[M]](implicit companion: GeneratedMessageCompanion[M]): M = {
+  def awaitMessage[M <: GeneratedMessage](implicit companion: GeneratedMessageCompanion[M]): M = {
     val resF = in.pull() map {
-      case Some(bytes) => LiteParser.parseFrom(companion, CodedInputStream.newInstance(bytes.toArray[Byte]))
+      case Some(bytes) => companion.parseFrom(CodedInputStream.newInstance(bytes.toArray[Byte]))
       case None => throw new RuntimeException("Stream completed")
     }
 

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

@@ -6,6 +6,7 @@ import Implicits._
 import akka.util.ByteString
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.utils.{BlockchainConfig, Logger, VmConfig}
+import scalapb.UnknownFieldSet
 
 import scala.annotation.tailrec
 
@@ -46,7 +47,7 @@ class VMClient(externalVmConfig: VmConfig.ExternalConfig, messageHandler: Messag
         log.debug("Client received msg: CallResult")
         res
 
-      case Query.GetAccount(msg.GetAccount(address)) =>
+      case Query.GetAccount(msg.GetAccount(address, UnknownFieldSet.empty)) =>
         log.debug("Client received msg: GetAccount")
         val accountMsg = world.getAccount(address) match {
           case Some(acc) =>
@@ -62,20 +63,20 @@ class VMClient(externalVmConfig: VmConfig.ExternalConfig, messageHandler: Messag
         messageHandler.sendMessage(accountMsg)
         messageLoop[W, S](world)
 
-      case Query.GetStorageData(msg.GetStorageData(address, offset)) =>
+      case Query.GetStorageData(msg.GetStorageData(address, offset, UnknownFieldSet.empty)) =>
         log.debug("Client received msg: GetStorageData")
         val value = world.getStorage(address).load(offset)
         val storageDataMsg = msg.StorageData(data = value)
         messageHandler.sendMessage(storageDataMsg)
         messageLoop[W, S](world)
 
-      case Query.GetCode(msg.GetCode(address)) =>
+      case Query.GetCode(msg.GetCode(address, UnknownFieldSet.empty)) =>
         log.debug("Client received msg: GetCode")
         val codeMsg = msg.Code(world.getCode(address))
         messageHandler.sendMessage(codeMsg)
         messageLoop[W, S](world)
 
-      case Query.GetBlockhash(msg.GetBlockhash(offset)) =>
+      case Query.GetBlockhash(msg.GetBlockhash(offset, UnknownFieldSet.empty)) =>
         log.debug("Client received msg: GetBlockhash")
         val blockhashMsg = world.getBlockHash(offset) match {
           case Some(value) => msg.Blockhash(hash = value)

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

@@ -10,7 +10,7 @@ import com.typesafe.config.ConfigFactory
 import io.iohk.ethereum.domain.{Address, BlockHeader}
 import io.iohk.ethereum.extvm.Implicits._
 import io.iohk.ethereum.utils._
-import io.iohk.ethereum.vm.{BlockchainConfigForEvm, ProgramResult, _}
+import io.iohk.ethereum.vm.{BlockchainConfigForEvm, ProgramResult, VM, ProgramContext, EvmConfig}
 import java.nio.ByteOrder
 import scala.annotation.tailrec
 import scala.util.{Failure, Success, Try}

src/main/scala/io/iohk/ethereum/faucet/FaucetSupervisor.scala

@@ -34,11 +34,11 @@ class FaucetSupervisor(walletService: WalletService, config: FaucetConfig, shutd
       )
       .withAutoReset(autoReset)
       .withSupervisorStrategy(OneForOneStrategy() {
-        case error: WalletException ⇒
+        case error: WalletException =>
           log.error(s"Stop ${FaucetHandler.name}", error)
           shutdown()
           SupervisorStrategy.Stop
-        case error ⇒
+        case error =>
           log.error(s"Restart ${FaucetHandler.name}", error)
           SupervisorStrategy.Restart
       })

src/main/scala/io/iohk/ethereum/faucet/jsonrpc/FaucetBuilder.scala

@@ -97,7 +97,7 @@ trait ShutdownHookBuilder {
 
   def shutdown(): Unit = {
     Await.ready(
-      system.terminate.map(
+      system.terminate().map(
         _ ->
           log.info("actor system finished")
       )(system.dispatcher),

src/main/scala/io/iohk/ethereum/jsonrpc/EthService.scala

@@ -649,7 +649,7 @@ class EthService(
       case Right(data) =>
         call(CallRequest(CallTx(tx.from, tx.to, tx.gas, tx.gasPrice, tx.value, ByteString(data)), req.block))
           .map(_.right.map { callResponse =>
-            IeleCallResponse(rlp.decode[Seq[ByteString]](callResponse.returnData.toArray[Byte])(seqEncDec[ByteString]))
+            IeleCallResponse(rlp.decode[Seq[ByteString]](callResponse.returnData.toArray[Byte])(seqEncDec[ByteString]()))
           })
       case Left(error) => Task.now(Left(error))
     }

src/main/scala/io/iohk/ethereum/ledger/BlockMetrics.scala

@@ -38,7 +38,7 @@ case object BlockMetrics extends MetricsContainer {
       case Some(parentBlock) =>
         val timeBetweenBlocksInSeconds: Long =
           block.header.unixTimestamp - parentBlock.header.unixTimestamp
-        TimeBetweenParentGauge.set(timeBetweenBlocksInSeconds)
+        TimeBetweenParentGauge.set(timeBetweenBlocksInSeconds.toDouble)
       case None => ()
     }
   }

src/main/scala/io/iohk/ethereum/metrics/DeltaSpikeGauge.scala

@@ -21,7 +21,7 @@ class DeltaSpikeGauge(name: String, metrics: Metrics) {
     }
   }
 
-  private[this] final val gauge = metrics.gauge(name, () => getValue)
+  private[this] final val gauge = metrics.gauge(name, () => getValue())
 
   def trigger(): Unit = {
     if (isTriggeredRef.compareAndSet(false, true)) {

src/main/scala/io/iohk/ethereum/network/PeerEventBusActor.scala

@@ -82,7 +82,10 @@ object PeerEventBusActor {
       * @param subscriber
       */
     override def unsubscribe(subscriber: ActorRef): Unit = {
-      messageSubscriptions = messageSubscriptions.filterKeys(_._1 != subscriber)
+      messageSubscriptions = messageSubscriptions.filter {
+        case ((sub, _), _) =>
+          sub != subscriber
+      }
       connectionSubscriptions = connectionSubscriptions.filterNot(_.subscriber == subscriber)
     }
 

src/main/scala/io/iohk/ethereum/network/PeerStatisticsActor.scala

@@ -39,11 +39,11 @@ class PeerStatisticsActor(
   private def handleStatsRequests: Receive = {
     case GetStatsForAll(window) =>
       val stats = maybeStats.map(_.getAll(Some(window))).getOrElse(Map.empty)
-      sender ! StatsForAll(stats)
+      sender() ! StatsForAll(stats)
 
     case GetStatsForPeer(window, peerId) =>
       val stats = maybeStats.map(_.get(peerId, Some(window))).getOrElse(PeerStat.empty)
-      sender ! StatsForPeer(peerId, stats)
+      sender() ! StatsForPeer(peerId, stats)
   }
 }
 

src/main/scala/io/iohk/ethereum/network/TimeSlotStats.scala

@@ -42,8 +42,9 @@ class TimeSlotStats[K, V: Monoid] private (
   }
 
   /** Forget all statistics about a given key. */
-  def remove(key: K): TimeSlotStats[K, V] =
-    updated(lastIdx, buffer.mapValues(_.remove(key)))
+  def remove(key: K): TimeSlotStats[K, V] = {
+    updated(lastIdx, buffer.map { case (k, v) => k -> v.remove(key) })
+  }
 
   /** Aggregate stats for a key in all slots that are within the duration. */
   def get(key: K, window: Option[Duration] = None): V =

src/main/scala/io/iohk/ethereum/network/discovery/DiscoveryServiceBuilder.scala

@@ -72,7 +72,7 @@ trait DiscoveryServiceBuilder {
     for {
       reusedKnownNodes <-
         if (discoveryConfig.reuseKnownNodes)
-          Task(knownNodesStorage.getKnownNodes.map(Node.fromUri))
+          Task(knownNodesStorage.getKnownNodes().map(Node.fromUri))
         else
           Task.pure(Set.empty[Node])
       // Discovery is going to enroll with all the bootstrap nodes passed to it.

src/main/scala/io/iohk/ethereum/network/discovery/PeerDiscoveryManager.scala

@@ -79,10 +79,10 @@ class PeerDiscoveryManager(
 
   private def handleNodeInfoRequests(discovery: Option[Discovery]): Receive = {
     case GetDiscoveredNodesInfo =>
-      sendDiscoveredNodesInfo(discovery.map(_._1), sender)
+      sendDiscoveredNodesInfo(discovery.map(_._1), sender())
 
     case GetRandomNodeInfo =>
-      sendRandomNodeInfo(discovery.map(_._2), sender)
+      sendRandomNodeInfo(discovery.map(_._2), sender())
   }
 
   // The service hasn't been started yet, so it just serves the static known nodes.

src/main/scala/io/iohk/ethereum/network/rlpx/AuthInitiateMessage.scala

@@ -36,12 +36,22 @@ case class AuthInitiateMessage(
     knownPeer: Boolean
 ) extends AuthInitiateEcdsaCodec {
 
-  lazy val encoded: ByteString = {
-    encodeECDSA(signature) ++
-      ephemeralPublicHash ++
-      //byte 0 of encoded ECC point indicates that it is uncompressed point, it is part of bouncycastle encoding
-      publicKey.getEncoded(false).drop(1) ++
-      nonce ++
-      ByteString(if (knownPeer) 1.toByte else 0.toByte)
-  }
+  import io.iohk.ethereum.utils.ByteStringUtils._
+  lazy val encoded: ByteString = concatByteStrings(
+    encodeECDSA(signature),
+    ephemeralPublicHash,
+    publicKey.getEncoded(false).drop(1),
+    nonce,
+    ByteString(if (knownPeer) 1.toByte else 0.toByte)
+  )
+
+
+//  lazy val encoded: ByteString = {
+//    encodeECDSA(signature) ++
+//      ephemeralPublicHash ++
+//      //byte 0 of encoded ECC point indicates that it is uncompressed point, it is part of bouncycastle encoding
+//      publicKey.getEncoded(false).drop(1) ++
+//      nonce ++
+//      ByteString(if (knownPeer) 1.toByte else 0.toByte)
+//  }
 }