Initial commit

Author: dmitry-worker

build.sbt

@@ -14,7 +14,7 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
   name := projectName,
   organization := "io.iohk",
   version := "3.2.1",
-  scalaVersion := "2.12.12",
+  scalaVersion := "2.13.4",
   // Scalanet snapshots are published to Sonatype after each build.
   resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
   testOptions in Test += Tests
@@ -24,10 +24,10 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
     "-deprecation",
     "-feature",
     "-Xfatal-warnings",
-    "-Xlint:unsound-match",
-    "-Ywarn-inaccessible",
-    "-Ywarn-unused-import",
-    "-Ypartial-unification",
+//    "-Xlint:unsound-match",
+//    "-Ywarn-inaccessible",
+//    "-Ywarn-unused-import",
+//    "-Ypartial-unification",
     "-encoding",
     "utf-8"
   ),

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

@@ -97,8 +97,8 @@ object ByteUtils {
 
   def padLeft(bytes: ByteString, length: Int, byte: Byte = 0): ByteString = {
     val l = math.max(0, length - bytes.length)
-    val fill = Seq.fill[Byte](l)(byte)
-    fill ++: bytes
+    val fill = Array.fill[Byte](l)(byte)
+    ByteString.apply(fill) ++ bytes
   }
 
   def compactPickledBytesToArray(buffer: ByteBuffer): Array[Byte] = {
@@ -141,7 +141,7 @@ object ByteUtils {
     * @param bigEndian - param specifying which int representation should be used.
     * @return Unit
     */
-  def intsToBytesMut(arr: Array[Int], b: Array[Byte], bigEndian: Boolean) {
+  def intsToBytesMut(arr: Array[Int], b: Array[Byte], bigEndian: Boolean): Unit = {
     if (!bigEndian) {
       var off = 0
       var i = 0
@@ -187,7 +187,7 @@ object ByteUtils {
     * @param bigEndian - param specifying which int representation should be used.
     * @return Unit
     */
-  def bytesToIntsMut(b: Array[Byte], arr: Array[Int], bigEndian: Boolean) {
+  def bytesToIntsMut(b: Array[Byte], arr: Array[Int], bigEndian: Boolean): Unit = {
     if (!bigEndian) {
       var off = 0
       var i = 0

crypto/src/main/scala/io/iohk/ethereum/crypto/ECDSASignature.scala

@@ -64,6 +64,7 @@ object ECDSASignature {
       case Some(id) if v == negativePointSign => (id * 2 + newNegativePointSign).toByte
       case Some(id) if v == positivePointSign => (id * 2 + newPositivePointSign).toByte
       case None => v
+      case _    => throw new IllegalStateException("Cannot happen")
     }
 
     ECDSASignature(r, s, pointSign)
@@ -176,6 +177,7 @@ case class ECDSASignature(r: BigInt, s: BigInt, v: Byte) {
     def bigInt2Bytes(b: BigInt) =
       ByteUtils.padLeft(ByteString(b.toByteArray).takeRight(RLength), RLength, 0)
 
-    bigInt2Bytes(r) ++ bigInt2Bytes(s) :+ v
+
+    bigInt2Bytes(r) ++ bigInt2Bytes(s) ++ ByteString(v)
   }
 }

crypto/src/main/scala/io/iohk/ethereum/crypto/MGF1BytesGeneratorExt.scala

@@ -11,7 +11,7 @@ import org.bouncycastle.crypto.Digest
 class MGF1BytesGeneratorExt(digest: Digest) {
   val digestSize: Int = digest.getDigestSize
 
-  private def itoOSP(i: Int, sp: Array[Byte]) {
+  private def itoOSP(i: Int, sp: Array[Byte]): Unit = {
     sp(0) = (i >>> 24).toByte
     sp(1) = (i >>> 16).toByte
     sp(2) = (i >>> 8).toByte

project/Dependencies.scala

@@ -96,7 +96,7 @@ object Dependencies {
 
   val crypto = Seq("org.bouncycastle" % "bcprov-jdk15on" % "1.66")
 
-  val scopt = Seq("com.github.scopt" % "scopt_2.12" % "3.7.1")
+  val scopt = Seq("com.github.scopt" %% "scopt" % "4.0.0")
 
   val cli = Seq("com.monovore" %% "decline" % "1.3.0")
 

project/build.properties

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

project/plugins.sbt

@@ -4,9 +4,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 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" % "3.0.0")
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-
-libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.6"