Merge phase 4

Author: mcsherrylabs

README.md

@@ -14,9 +14,11 @@ The scala build tool [sbt](http://www.scala-sbt.org/) must be installed.
 
 A recent [java sdk](http://www.oracle.com/technetwork/java/javase/downloads/index.html#close) must be installed.
 
-### Milestone 3 - transaction execution
 
-**This version of the code supports downloading the blockchain from remote peers and executing the transactions in the blocks. When all transactions up to and including the latest have been executed the client will continue to stay synchronized.**
+### Milestone 3 & 4 - JSON RPC and Miner Integration
+
+**This version of the code supports almost all the functionality for a first release.**
+
 
 For the curious ...
 
@@ -42,11 +44,13 @@ The client attempts to contact the remote peers configured in the configuration
 `fast-sync` download. The [configuration file](https://github.com/input-output-hk/etc-client/blob/master/src/main/resources/application.conf)
 settings can all be overriden in 
 
-`./config/application.conf`
+`./config/production.conf`
 
-The client has not been run on Windows.
+The client has been run on Windows 8 and seems to work however it has not been extensively tested.
 
-The next milestone involves integrating our client with Mist browser!
+
+The next milestone is our early Beta release!!
+
 
 
 

build.sbt

@@ -8,7 +8,7 @@ val commonSettings = Seq(
 
 val dep = {
   val akkaVersion = "2.4.17"
-  val akkaHttpVersion = "10.0.3"
+  val akkaHttpVersion = "10.0.6"
   val circeVersion = "0.7.0"
 
   Seq(
@@ -17,15 +17,18 @@ val dep = {
     "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
     "com.typesafe.akka" %% "akka-testkit" % akkaVersion,
     "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
-    "com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion,
+    "ch.megard" %% "akka-http-cors" % "0.2.1",
+    "org.json4s" %% "json4s-native" % "3.5.1",
+    "de.heikoseeberger" %% "akka-http-json4s" % "1.11.0",
     "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "it,test",
     "io.suzaku" %% "boopickle" % "1.2.6",
     "org.consensusresearch" %% "scrypto" % "1.2.0-RC3",
-    "com.madgag.spongycastle" % "core" % "1.54.0.0",
+    "com.madgag.spongycastle" % "core" % "1.56.0.0",
     "org.iq80.leveldb" % "leveldb" % "0.9",
     "org.scorexfoundation" %% "iodb" % "0.3.0",
     "ch.qos.logback" % "logback-classic" % "1.1.9",
     "org.scalatest" %% "scalatest" % "3.0.1" % "it,test",
+    "org.scalamock" %% "scalamock-scalatest-support" % "3.5.0" % "test",
     "org.scalacheck" %% "scalacheck" % "1.13.4" % "it,test",
     "org.scalacheck" %% "scalacheck" % "1.13.4" % "it,test",
     "ch.qos.logback" % "logback-classic" % "1.1.9",
@@ -35,7 +38,8 @@ val dep = {
     "io.circe" %% "circe-generic" % circeVersion,
     "io.circe" %% "circe-parser" % circeVersion,
     "io.circe" %% "circe-generic-extras" % circeVersion,
-    "com.miguno.akka" %% "akka-mock-scheduler" % "0.5.1" % "it,test"
+    "com.miguno.akka" %% "akka-mock-scheduler" % "0.5.1" % "it,test",
+    "commons-io" % "commons-io" % "2.5"
   )
 }
 
@@ -58,6 +62,8 @@ scalacOptions := Seq(
   "-Xfatal-warnings"
 )
 
+parallelExecution in Test := false
+
 testOptions in Test += Tests.Argument("-oD")
 
 (test in Evm) := (test in Evm).dependsOn(solidityCompile).value
@@ -67,5 +73,3 @@ testOptions in Test += Tests.Argument("-oD")
 scalastyleSources in Test ++= {(unmanagedSourceDirectories in Integration).value}
 
 mainClass in Compile := Some("io.iohk.ethereum.App")
-
-coverageExcludedPackages := "io.iohk.ethereum.vmrunner.*"

circle.yml

@@ -1,3 +1,22 @@
 dependencies:
   pre:
     - sudo add-apt-repository -y ppa:ethereum/ethereum; sudo apt-get update; sudo apt-get install -y solc
+
+  # We want override the dependency steps inferred by CircleCI, which happens to be `sbt test:compile`. This is redundant
+  # because tests need to be recompiled anyway, with coverage. Note that an empty list doesn't work here.
+  override:
+    - echo "OK, let's go!"
+
+test:
+  override:
+    - sbt scalastyle
+    - sbt test:scalastyle
+    - sbt coverage test
+    - sbt coverage evm:test
+    - sbt coverageOff it:test
+    - sbt coverageReport coverageAggregate coveralls
+    - sbt dist
+  post:
+    - mkdir -p $CIRCLE_ARTIFACTS/scala-2.12
+    - mv target/scala-2.12/coverage-report  $CIRCLE_ARTIFACTS/scala-2.12/coverage-report
+    - mv target/scala-2.12/scoverage-report $CIRCLE_ARTIFACTS/scala-2.12/scoverage-report

src/evmTest/scala/io/iohk/ethereum/vm/PrecompiledContractsSpecEvm.scala

@@ -4,14 +4,15 @@ import akka.util.ByteString
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.crypto._
 import io.iohk.ethereum.domain.SignedTransaction.{FirstByteOfAddress, LastByteOfAddress}
+import io.iohk.ethereum.nodebuilder.SecureRandomBuilder
 import io.iohk.ethereum.vm.utils.EvmTestEnv
 import org.scalatest.{FunSuite, Matchers}
 import org.spongycastle.crypto.params.ECPublicKeyParameters
 
-class PrecompiledContractsSpecEvm extends FunSuite with Matchers {
+class PrecompiledContractsSpecEvm extends FunSuite with Matchers with SecureRandomBuilder {
 
   test("Precompiled Contracts") {
-    val keyPair = generateKeyPair()
+    val keyPair = generateKeyPair(secureRandom)
     val bytes: Array[Byte] = ByteString("aabbccdd").toArray[Byte]
     val signature = ECDSASignature.sign(bytes, keyPair)
     val pubKey = keyPair.getPublic.asInstanceOf[ECPublicKeyParameters].getQ.getEncoded(false)

src/it/scala/io/iohk/ethereum/rlp/RLPSpeedSuite.scala

@@ -2,21 +2,21 @@ package io.iohk.ethereum.rlp
 
 import akka.util.ByteString
 import io.iohk.ethereum.ObjectGenerators
-import io.iohk.ethereum.domain.{Address, BlockHeader, SignedTransaction, Transaction}
-import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
-import io.iohk.ethereum.rlp
+import io.iohk.ethereum.domain.Block._
+import io.iohk.ethereum.domain._
+import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.Logger
 import org.scalacheck.Gen
 import org.scalatest.FunSuite
 import org.scalatest.prop.{GeneratorDrivenPropertyChecks, PropertyChecks}
 import org.spongycastle.util.encoders.Hex
 
 /**
- * Tests based on
- *   - https://github.com/cryptape/ruby-rlp/blob/master/test/speed.rb
- *   - https://github.com/ethereum/pyrlp/blob/develop/tests/speed.py
- */
+  * Tests based on
+  *   - https://github.com/cryptape/ruby-rlp/blob/master/test/speed.rb
+  *   - https://github.com/ethereum/pyrlp/blob/develop/tests/speed.py
+  */
 class RLPSpeedSuite extends FunSuite
     with PropertyChecks
     with GeneratorDrivenPropertyChecks
@@ -28,23 +28,23 @@ class RLPSpeedSuite extends FunSuite
   test("Main") {
     val startBlockSerialization: Long = System.currentTimeMillis
     val block = blockGen.sample.get
-    val serializedBlock = doTestSerialize[TestBlock](block, rounds)(TestBlock.encDec)
+    val serializedBlock = doTestSerialize[Block](block, (b: Block) => b.toBytes, rounds)
     val elapsedBlockSerialization = (System.currentTimeMillis() - startBlockSerialization) / 1000f
     log.info(s"Block serializations / sec: (${rounds.toFloat / elapsedBlockSerialization})")
 
     val blockDeserializationStart: Long = System.currentTimeMillis
-    val deserializedBlock: TestBlock = doTestDeserialize(serializedBlock, rounds)(TestBlock.encDec)
+    val deserializedBlock: Block = doTestDeserialize(serializedBlock, (b: Array[Byte]) => b.toBlock, rounds)
     val elapsedBlockDeserialization = (System.currentTimeMillis() - blockDeserializationStart) / 1000f
     log.info(s"Block deserializations / sec: (${rounds.toFloat / elapsedBlockDeserialization})")
 
     val serializationTxStart: Long = System.currentTimeMillis
     val tx = validTransaction
-    val serializedTx = doTestSerialize(tx, rounds)(SignedTransactions.txRlpEncDec)
+    val serializedTx = doTestSerialize(tx, (stx: SignedTransaction) => stx.toBytes, rounds)
     val elapsedTxSerialization = (System.currentTimeMillis() - serializationTxStart) / 1000f
     log.info(s"TX serializations / sec: (${rounds.toFloat / elapsedTxSerialization})")
 
     val txDeserializationStart: Long = System.currentTimeMillis
-    val deserializedTx: SignedTransaction = doTestDeserialize(serializedTx, rounds)(SignedTransactions.txRlpEncDec)
+    val deserializedTx: SignedTransaction = doTestDeserialize(serializedTx, (b: Array[Byte]) => b.toSignedTransaction, rounds)
     val elapsedTxDeserialization = (System.currentTimeMillis() - txDeserializationStart) / 1000f
     log.info(s"TX deserializations / sec: (${rounds.toFloat / elapsedTxDeserialization})")
   }
@@ -60,14 +60,18 @@ class RLPSpeedSuite extends FunSuite
     log.info("Result decode()\t: " + (end1 - start1) + "ms")
   }
 
-  def doTestSerialize[T](toSerialize: T, rounds: Int)(implicit enc: RLPEncoder[T]): Array[Byte] = {
-    (1 until rounds).foreach(_ => { encode[T](toSerialize) })
-    encode[T](toSerialize)
+  def doTestSerialize[T](toSerialize: T, encode: T => Array[Byte], rounds: Int): Array[Byte] = {
+    (1 until rounds).foreach(_ => {
+      encode(toSerialize)
+    })
+    encode(toSerialize)
   }
 
-  def doTestDeserialize[T](serialized: Array[Byte], rounds: Int)(implicit dec: RLPDecoder[T]): T = {
-    (1 until rounds).foreach(_ => { decode[T](serialized) })
-    decode[T](serialized)
+  def doTestDeserialize[T](serialized: Array[Byte], decode: Array[Byte] => T, rounds: Int): T = {
+    (1 until rounds).foreach(_ => {
+      decode(serialized)
+    })
+    decode(serialized)
   }
 
   val validTransaction = SignedTransaction(
@@ -84,34 +88,8 @@ class RLPSpeedSuite extends FunSuite
     chainId = 0x3d.toByte
   ).get
 
-  lazy val blockGen: Gen[TestBlock] = for {
+  lazy val blockGen: Gen[Block] = for {
     header <- blockHeaderGen
     uncles <- blockHeaderGen
-  } yield TestBlock(header = header, transactions = List.fill(10)(validTransaction), uncles = Seq(uncles))
-}
-
-// FIXME Replace with our entity once implemented in our codebase
-case class TestBlock(header: BlockHeader, transactions: Seq[SignedTransaction], uncles: Seq[BlockHeader])
-
-object TestBlock {
-
-  implicit val encDec = new RLPEncoder[TestBlock] with RLPDecoder[TestBlock] {
-
-    override def encode(obj: TestBlock): RLPEncodeable = {
-      val rplEncodeables: Seq[RLPEncodeable] =
-        obj.transactions.map(SignedTransactions.txRlpEncDec.encode)
-      RLPList(headerRlpEncDec.encode(obj.header),
-              RLPList(rplEncodeables: _*),
-              RLPList(obj.uncles.map(headerRlpEncDec.encode(_)): _*))
-    }
-
-    override def decode(rlp: RLPEncodeable): TestBlock = rlp match {
-      case RLPList(header, txs: RLPList, uncles: RLPList) =>
-        TestBlock(headerRlpEncDec.decode(header),
-                  txs.items.map(SignedTransactions.txRlpEncDec.decode),
-                  uncles.items.map(headerRlpEncDec.decode))
-      case _ => throw new RuntimeException("Invalid Block encodeable")
-    }
-
-  }
+  } yield Block(header = header, BlockBody(transactionList = List.fill(10)(validTransaction), uncleNodesList = Seq(uncles)))
 }

src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala

@@ -1,5 +1,6 @@
 package io.iohk.ethereum.txExecTest
 
+import io.iohk.ethereum.domain.Receipt
 import io.iohk.ethereum.ledger.LedgerImpl
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
 import io.iohk.ethereum.utils.{BlockchainConfig, Config}
@@ -12,7 +13,7 @@ import scala.language.postfixOps
 class ContractTest extends FlatSpec with Matchers {
   val blockchainConfig = BlockchainConfig(Config.config)
 
-  val noErrors: Right[Nothing, Unit] = Right(())
+  val noErrors = a[Right[_, Seq[Receipt]]]
   val validators = new Validators {
     val blockValidator: BlockValidator = BlockValidator
     val blockHeaderValidator: BlockHeaderValidator = new BlockHeaderValidatorImpl(blockchainConfig)
@@ -21,7 +22,7 @@ class ContractTest extends FlatSpec with Matchers {
   }
 
   "Ledger" should "transfer ether" in {
-    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract/")
+    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract")
 
     val storage = FixtureProvider.prepareStorages(0, fixtures)
 
@@ -30,7 +31,7 @@ class ContractTest extends FlatSpec with Matchers {
   }
 
   it should "deploy contract" in {
-    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract/")
+    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract")
 
     val storage = FixtureProvider.prepareStorages(1, fixtures)
 
@@ -39,7 +40,7 @@ class ContractTest extends FlatSpec with Matchers {
   }
 
   it should "execute contract call" in {
-    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract/")
+    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract")
 
     val storage = FixtureProvider.prepareStorages(2, fixtures)
 
@@ -48,7 +49,7 @@ class ContractTest extends FlatSpec with Matchers {
   }
 
   it should "execute contract that pays 2 accounts" in {
-    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract/")
+    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/purchaseContract")
 
     val storage = FixtureProvider.prepareStorages(2, fixtures)
 

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -1,11 +1,12 @@
 package io.iohk.ethereum.txExecTest
 
 import akka.util.ByteString
+import io.iohk.ethereum.domain.Receipt
 import io.iohk.ethereum.ledger.LedgerImpl
 import io.iohk.ethereum.txExecTest.util.FixtureProvider
-import io.iohk.ethereum.utils.BlockchainConfig
+import io.iohk.ethereum.utils.{BlockchainConfig, MonetaryPolicyConfig}
 import io.iohk.ethereum.validators._
-import io.iohk.ethereum.vm.{VM, UInt256}
+import io.iohk.ethereum.vm.{UInt256, VM}
 import org.scalatest.{FlatSpec, Matchers}
 
 class ForksTest extends FlatSpec with Matchers {
@@ -17,7 +18,7 @@ class ForksTest extends FlatSpec with Matchers {
     override val eip160BlockNumber: BigInt = 7
 
     override val chainId: Byte = 0x3d
-    override val blockReward: UInt256 = UInt256(BigInt("4563918244F40000", 16))
+    override val monetaryPolicyConfig: MonetaryPolicyConfig = MonetaryPolicyConfig(5000000, 0.2, 5000000000000000000L)
 
     // unused
     override val customGenesisFileOpt: Option[String] = None
@@ -30,7 +31,7 @@ class ForksTest extends FlatSpec with Matchers {
 
   val ledger = new LedgerImpl(VM, blockchainConfig)
 
-  val noErrors: Right[Nothing, Unit] = Right(())
+  val noErrors = a[Right[_, Seq[Receipt]]]
 
   val validators = new Validators {
     val blockValidator: BlockValidator = BlockValidator
@@ -40,7 +41,7 @@ class ForksTest extends FlatSpec with Matchers {
   }
 
   "Ledger" should "execute blocks with respect to forks" in {
-    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/forksTest/")
+    val fixtures: FixtureProvider.Fixture = FixtureProvider.loadFixtures("/txExecTest/forksTest")
 
     val startBlock = 1
     val endBlock = 11