[WIP] Update scalapb

build.sbt

@@ -16,8 +16,8 @@ val commonSettings = Seq(
 val malletDeps = Seq(
   Dependencies.scopt
 ).flatten ++ Seq(
-  "org.jline" % "jline" % "3.1.2",
-  "net.java.dev.jna" % "jna" % "4.5.1"
+  Dependencies.jline,
+  Dependencies.jna
 )
 
 val dep = {

project/Dependencies.scala

@@ -38,7 +38,7 @@ object Dependencies {
     )
   }
 
-  val boopickle = Seq("io.suzaku" %% "boopickle" % "1.3.0")
+  val boopickle = Seq("io.suzaku" %% "boopickle" % "1.3.3")
 
   val rocksDb = Seq(
     "org.rocksdb" % "rocksdbjni" % "6.11.4"
@@ -54,7 +54,7 @@ object Dependencies {
     "org.scalatest" %% "scalatest" % "3.2.2" % "it,test",
     "org.scalamock" %% "scalamock" % "5.0.0" % "test",
     "org.scalatestplus" %% "scalacheck-1-14" % "3.2.2.0" % "test",
-    "org.scalacheck" %% "scalacheck" % "1.14.1" % "it,test"
+    "org.scalacheck" %% "scalacheck" % "1.14.3" % "it,test"
   )
 
   val cats: Seq[ModuleID] = {
@@ -72,33 +72,37 @@ object Dependencies {
 
   val logging = Seq(
     "ch.qos.logback" % "logback-classic" % "1.2.3",
-    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
+    "com.typesafe.scala-logging" %% "scala-logging" % "3.9.2",
     "net.logstash.logback" % "logstash-logback-encoder" % "6.4",
-    "org.codehaus.janino" % "janino" % "3.0.6"
+    "org.codehaus.janino" % "janino" % "3.1.2"
   )
 
-  val twitterUtilCollection = Seq("com.twitter" %% "util-collection" % "18.5.0")
+  val twitterUtilCollection = Seq("com.twitter" %% "util-collection" % "19.1.0")
 
-  val crypto = Seq("org.bouncycastle" % "bcprov-jdk15on" % "1.59")
+  val crypto = Seq("org.bouncycastle" % "bcprov-jdk15on" % "1.66")
 
-  val scopt = Seq("com.github.scopt" % "scopt_2.12" % "3.7.0")
+  val scopt = Seq("com.github.scopt" % "scopt_2.12" % "3.7.1")
 
   val apacheCommons = Seq(
-    "commons-io" % "commons-io" % "2.6"
+    "commons-io" % "commons-io" % "2.8.0"
   )
 
+  val jline = "org.jline" % "jline" % "3.16.0"
+
+  val jna = "net.java.dev.jna" % "jna" % "5.6.0"
+
   val dependencies = Seq(
-    "org.jline" % "jline" % "3.1.2",
-    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0",
-    "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.0.0",
-    "com.google.guava" % "guava" % "28.0-jre",
-    "org.xerial.snappy" % "snappy-java" % "1.1.7.2",
-    "org.web3j" % "core" % "3.4.0" % "test"
+    jline,
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2",
+    "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.1.0",
+    "com.google.guava" % "guava" % "29.0-jre",
+    "org.xerial.snappy" % "snappy-java" % "1.1.7.7",
+    "org.web3j" % "core" % "5.0.0" % Test
   )
 
   val prometheus: Seq[ModuleID] = {
     val provider = "io.prometheus"
-    val version = "0.8.0"
+    val version = "0.9.0"
     Seq(
       provider % "simpleclient" % version,
       provider % "simpleclient_logback" % version,
@@ -109,7 +113,7 @@ object Dependencies {
 
   val micrometer: Seq[ModuleID] = {
     val provider = "io.micrometer"
-    val version = "1.0.4"
+    val version = "1.5.5"
     Seq(
       // Required to compile metrics library https://github.com/micrometer-metrics/micrometer/issues/1133#issuecomment-452434205
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % Optional,

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.2.8
+sbt.version = 1.3.13

project/plugins.sbt

@@ -1,9 +1,9 @@
 logLevel := sbt.Level.Warn
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
-addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.34")
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
 
-libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.8"

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

@@ -5,8 +5,8 @@ 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 org.bouncycastle.util.BigIntegers
+import scalapb.{GeneratedMessage, GeneratedMessageCompanion, LiteParser}
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
@@ -24,9 +24,12 @@ 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) =>
+        LiteParser
+          .parseDelimitedFrom(CodedInputStream.newInstance(bytes.toArray[Byte]))
+          .getOrElse( throw new RuntimeException(s"Unable to parse message: $bytes") )
       case None => throw new RuntimeException("Stream completed")
     }
 

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

@@ -49,7 +49,7 @@ class VMClient(
         log.debug("Client received msg: CallResult")
         res
 
-      case Query.GetAccount(msg.GetAccount(address)) =>
+      case Query.GetAccount(msg.GetAccount(address, _)) =>
         log.debug("Client received msg: GetAccount")
         val accountMsg = world.getAccount(address) match {
           case Some(acc) =>
@@ -65,20 +65,20 @@ class VMClient(
         messageHandler.sendMessage(accountMsg)
         messageLoop[W, S](world)
 
-      case Query.GetStorageData(msg.GetStorageData(address, offset)) =>
+      case Query.GetStorageData(msg.GetStorageData(address, offset, _)) =>
         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, _)) =>
         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, _)) =>
         log.debug("Client received msg: GetBlockhash")
         val blockhashMsg = world.getBlockHash(offset) match {
           case Some(value) => msg.Blockhash(hash = value)

src/test/scala/io/iohk/ethereum/extvm/MessageHandlerSpec.scala

@@ -5,7 +5,6 @@ import akka.stream.OverflowStrategy
 import akka.stream.scaladsl.{Keep, Sink, SinkQueueWithCancel, Source, SourceQueueWithComplete}
 import akka.testkit.TestProbe
 import akka.util.ByteString
-import com.trueaccord.scalapb.GeneratedMessage
 import io.iohk.ethereum.vm.Generators
 import java.math.BigInteger
 import org.bouncycastle.util.BigIntegers
@@ -14,6 +13,7 @@ import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import scala.concurrent.ExecutionContext.Implicits.global
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import scalapb.GeneratedMessage
 
 class MessageHandlerSpec extends AnyFlatSpec with Matchers with MockFactory with ScalaCheckPropertyChecks {
 

src/test/scala/io/iohk/ethereum/extvm/VMClientSpec.scala

@@ -1,7 +1,6 @@
 package io.iohk.ethereum.extvm
 
 import akka.util.ByteString
-import com.trueaccord.scalapb.GeneratedMessageCompanion
 import io.iohk.ethereum.domain.{Account, Address, UInt256}
 import io.iohk.ethereum.extvm.msg.CallContext.Config
 import io.iohk.ethereum.utils.VmConfig
@@ -11,6 +10,7 @@ import org.scalamock.scalatest.MockFactory
 import org.bouncycastle.util.encoders.Hex
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import scalapb.GeneratedMessageCompanion
 
 class VMClientSpec extends AnyFlatSpec with Matchers with MockFactory {
 

src/test/scala/io/iohk/ethereum/extvm/VMServerSpec.scala

@@ -1,12 +1,12 @@
 package io.iohk.ethereum.extvm
 
 import akka.util.ByteString
-import com.trueaccord.scalapb.GeneratedMessageCompanion
 import io.iohk.ethereum.domain.{Account, Address}
 import io.iohk.ethereum.extvm.msg.{CallContext, VMQuery}
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import scalapb.GeneratedMessageCompanion
 
 class VMServerSpec extends AnyFlatSpec with Matchers with MockFactory {
 

src/test/scala/io/iohk/ethereum/extvm/WorldSpec.scala

@@ -1,12 +1,12 @@
 package io.iohk.ethereum.extvm
 
 import akka.util.ByteString
-import com.trueaccord.scalapb.GeneratedMessageCompanion
 import io.iohk.ethereum.domain.{Account, Address, UInt256}
 import org.scalamock.scalatest.MockFactory
 import org.bouncycastle.util.encoders.Hex
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
+import scalapb.GeneratedMessageCompanion
 
 class WorldSpec extends AnyFlatSpec with Matchers with MockFactory {