ETCM-166: Move crypto to separate project

Author: aakoshh

.buildkite/pipeline.nix

@@ -75,6 +75,19 @@ in
       ];
     };
 
+    test-crypto = commonAttrs // {
+      dependsOn = [ compile ];
+      label = "Crypto tests";
+      command = ''
+        nix-shell --run '$SBT coverage crypto/test'
+      '';
+      artifactPaths = [
+        "crypto/target/test-reports/**/*"
+        "crypto/target/scala-2.12/scoverage-report/**/*"
+        "crypto/target/scala-2.12/coverage-report/**/*"
+      ];
+    };
+
     test-rlp = commonAttrs // {
       dependsOn = [ compile ];
       label = "RLP tests";

build.sbt

@@ -42,11 +42,11 @@ def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
   (scalastyleConfig in Test) := file("scalastyle-test-config.xml")
 )
 
-lazy val bytes = {
-  // Adding an "it" config because in `Dependencies.scala` some are declared with `% "it,test"`
-  // which would fail if the project didn't have configuration to add to.
-  val Integration = config("it") extend Test
+// Adding an "it" config because in `Dependencies.scala` some are declared with `% "it,test"`
+// which would fail if the project didn't have configuration to add to.
+val Integration = config("it") extend Test
 
+lazy val bytes = {
   val bytes = project
     .in(file("bytes"))
     .configs(Integration)
@@ -60,9 +60,23 @@ lazy val bytes = {
   bytes
 }
 
-lazy val rlp = {
-  val Integration = config("it") extend Test
+lazy val crypto = {
+  val crypto = project
+    .in(file("crypto"))
+    .configs(Integration)
+    .dependsOn(bytes)
+    .settings(commonSettings("mantis-crypto"))
+    .settings(
+      libraryDependencies ++=
+        Dependencies.akkaUtil ++
+          Dependencies.crypto ++
+          Dependencies.testing
+    )
+
+  crypto
+}
 
+lazy val rlp = {
   val rlp = project
     .in(file("rlp"))
     .configs(Integration)
@@ -79,9 +93,6 @@ lazy val rlp = {
 }
 
 lazy val node = {
-
-  val Integration = config("it") extend Test
-
   val Benchmark = config("benchmark") extend Test
 
   val Evm = config("evm") extend Test
@@ -135,7 +146,7 @@ lazy val node = {
     .in(file("."))
     .configs(Integration, Benchmark, Evm, Ets, Snappy, Rpc)
     .enablePlugins(BuildInfoPlugin)
-    .dependsOn(bytes, rlp)
+    .dependsOn(bytes, crypto, rlp)
     .settings(
       buildInfoKeys := Seq[BuildInfoKey](name, version, git.gitHeadCommit),
       buildInfoPackage := "io.iohk.ethereum.utils"
@@ -196,6 +207,8 @@ addCommandAlias(
   "compile-all",
   """;bytes/compile
     |;bytes/test:compile
+    |;crypto/compile
+    |;crypto/test:compile
     |;rlp/compile
     |;rlp/test:compile
     |;compile
@@ -216,6 +229,9 @@ addCommandAlias(
     |;bytes/scalafmtAll
     |;bytes/scalastyle
     |;bytes/test:scalastyle
+    |;crypto/scalafmtAll
+    |;crypto/scalastyle
+    |;crypto/test:scalastyle
     |;rlp/scalafmtAll
     |;rlp/scalastyle
     |;rlp/test:scalastyle

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

@@ -0,0 +1,12 @@
+package io.iohk.ethereum.utils
+
+import akka.util.ByteString
+
+object ByteStringUtils {
+  def hash2string(hash: ByteString): String =
+    Hex.toHexString(hash.toArray[Byte])
+
+  // unsafe
+  def string2hash(hash: String): ByteString =
+    ByteString(Hex.decode(hash))
+}

rlp/src/main/scala/io/iohk/ethereum/rlp/Hex.scala renamed to bytes/src/main/scala/io/iohk/ethereum/utils/Hex.scala

@@ -1,6 +1,6 @@
-package io.iohk.ethereum.rlp
+package io.iohk.ethereum.utils
 
-protected[rlp] object Hex {
+object Hex {
   def toHexString(bytes: Array[Byte]): String =
     bytes.map("%02x".format(_)).mkString
 

src/main/scala/io/iohk/ethereum/crypto/ConcatKDFBytesGenerator.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/ConcatKDFBytesGenerator.scala

@@ -179,25 +179,3 @@ case class ECDSASignature(r: BigInt, s: BigInt, v: Byte) {
     bigInt2Bytes(r) ++ bigInt2Bytes(s) :+ v
   }
 }
-
-object ECDSASignatureImplicits {
-
-  import io.iohk.ethereum.rlp.RLPImplicitConversions._
-  import io.iohk.ethereum.rlp.RLPImplicits._
-  import io.iohk.ethereum.rlp._
-
-  implicit val ecdsaSignatureDec: RLPDecoder[ECDSASignature] = new RLPDecoder[ECDSASignature] {
-    override def decode(rlp: RLPEncodeable): ECDSASignature = rlp match {
-      case RLPList(r, s, v) => ECDSASignature(r: ByteString, s: ByteString, v)
-      case _ => throw new RuntimeException("Cannot decode ECDSASignature")
-    }
-  }
-
-  implicit class ECDSASignatureEnc(ecdsaSignature: ECDSASignature) extends RLPSerializable {
-    override def toRLPEncodable: RLPEncodeable = {
-      RLPList(ecdsaSignature.r, ecdsaSignature.s, ecdsaSignature.v)
-    }
-  }
-
-  implicit val ECDSASignatureOrdering: Ordering[ECDSASignature] = Ordering.by(sig => (sig.r, sig.s, sig.v))
-}

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

@@ -1,7 +1,6 @@
 package io.iohk.ethereum.crypto
 
 import akka.util.ByteString
-import io.iohk.ethereum.security.SecureRandomBuilder
 import io.iohk.ethereum.utils.ByteStringUtils
 import org.scalacheck.Arbitrary
 import org.scalacheck.Arbitrary.arbitrary

src/main/scala/io/iohk/ethereum/crypto/ECIESCoder.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/ECIESCoder.scala

@@ -2,7 +2,6 @@ package io.iohk.ethereum.crypto
 
 import java.math.BigInteger
 
-import io.iohk.ethereum.security.SecureRandomBuilder
 import org.bouncycastle.crypto.generators.ECKeyPairGenerator
 import org.bouncycastle.crypto.params.ECKeyGenerationParameters
 import org.bouncycastle.util.encoders.Hex

src/main/scala/io/iohk/ethereum/crypto/EthereumIESEngine.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/EthereumIESEngine.scala

@@ -0,0 +1,7 @@
+package io.iohk.ethereum.crypto
+
+import java.security.SecureRandom
+
+private[crypto] trait SecureRandomBuilder {
+  lazy val secureRandom: SecureRandom = new SecureRandom()
+}

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

@@ -2,12 +2,17 @@ package io.iohk.ethereum.crypto.zksnarks
 
 import io.iohk.ethereum.crypto.zksnark._
 import io.iohk.ethereum.crypto.zksnark.FiniteField.Ops._
-import io.iohk.ethereum.vm.Generators._
 import org.scalacheck.Gen
+import org.scalacheck.Arbitrary.arbitrary
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 import org.scalatest.funsuite.AnyFunSuite
+import java.math.BigInteger
 
 abstract class FieldSpec[T: FiniteField] extends AnyFunSuite with ScalaCheckPropertyChecks {
+  val bigIntGen: Gen[BigInteger] = for {
+    bytes <- Gen.listOfN(32, arbitrary[Byte])
+  } yield new BigInteger(1, bytes.toArray)
+
   def fpGenerator: Gen[Fp] = bigIntGen.map(Fp(_)).retryUntil(fp => fp.isValid())
 
   def fp2Generator: Gen[Fp2] = for {

src/main/scala/io/iohk/ethereum/crypto/SymmetricCipher.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/SymmetricCipher.scala

@@ -3,6 +3,7 @@ package io.iohk.ethereum
 import akka.util.ByteString
 import scala.reflect.ClassTag
 import scala.util.control.NonFatal
+import io.iohk.ethereum.utils.Hex
 
 package object rlp {
 

src/main/scala/io/iohk/ethereum/crypto/package.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/package.scala

@@ -3,6 +3,7 @@ package io.iohk.ethereum.rlp
 import akka.util.ByteString
 import io.iohk.ethereum.rlp.RLPImplicitConversions._
 import io.iohk.ethereum.rlp.RLPImplicits._
+import io.iohk.ethereum.utils.Hex
 import org.scalacheck.{Arbitrary, Gen}
 import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckPropertyChecks}
 import scala.language.implicitConversions

src/main/scala/io/iohk/ethereum/crypto/zksnark/BN128.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/zksnark/BN128.scala

@@ -6,6 +6,7 @@ import io.iohk.ethereum.domain.Block._
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
 import io.iohk.ethereum.utils.Logger
+import io.iohk.ethereum.utils.Hex
 import org.scalacheck.Gen
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatestplus.scalacheck.{ScalaCheckDrivenPropertyChecks, ScalaCheckPropertyChecks}

src/main/scala/io/iohk/ethereum/crypto/zksnark/FieldElement.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/zksnark/FieldElement.scala

@@ -0,0 +1,25 @@
+package io.iohk.ethereum.crypto
+
+import akka.util.ByteString
+
+object ECDSASignatureImplicits {
+
+  import io.iohk.ethereum.rlp.RLPImplicitConversions._
+  import io.iohk.ethereum.rlp.RLPImplicits._
+  import io.iohk.ethereum.rlp._
+
+  implicit val ecdsaSignatureDec: RLPDecoder[ECDSASignature] = new RLPDecoder[ECDSASignature] {
+    override def decode(rlp: RLPEncodeable): ECDSASignature = rlp match {
+      case RLPList(r, s, v) => ECDSASignature(r: ByteString, s: ByteString, v)
+      case _ => throw new RuntimeException("Cannot decode ECDSASignature")
+    }
+  }
+
+  implicit class ECDSASignatureEnc(ecdsaSignature: ECDSASignature) extends RLPSerializable {
+    override def toRLPEncodable: RLPEncodeable = {
+      RLPList(ecdsaSignature.r, ecdsaSignature.s, ecdsaSignature.v)
+    }
+  }
+
+  implicit val ECDSASignatureOrdering: Ordering[ECDSASignature] = Ordering.by(sig => (sig.r, sig.s, sig.v))
+}

src/main/scala/io/iohk/ethereum/crypto/zksnark/FiniteField.scala renamed to crypto/src/main/scala/io/iohk/ethereum/crypto/zksnark/FiniteField.scala

@@ -10,7 +10,6 @@ import io.iohk.ethereum.domain.Address
 import io.iohk.ethereum.network.PeerManagerActor.{FastSyncHostConfiguration, PeerConfiguration}
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
 import io.iohk.ethereum.utils.VmConfig.VmMode
-import org.bouncycastle.util.encoders.Hex
 import ConfigUtils._
 
 import scala.collection.JavaConverters._