Merge branch 'phase/3/txExecution'

Author: adamsmo

.gitignore

@@ -11,3 +11,5 @@ nodeId.keys
 *.sc
 
 *.log
+*.log.zip
+.evm-runner_history

build.sbt

@@ -1,4 +1,4 @@
-enablePlugins(JavaAppPackaging)
+enablePlugins(JavaAppPackaging, SolidityPlugin)
 
 val commonSettings = Seq(
   name := "etc-client",
@@ -9,6 +9,7 @@ val commonSettings = Seq(
 val dep = {
   val akkaVersion = "2.4.17"
   val akkaHttpVersion = "10.0.3"
+  val circeVersion = "0.7.0"
 
   Seq(
     "com.typesafe.akka" %% "akka-actor" % akkaVersion,
@@ -22,23 +23,49 @@ val dep = {
     "org.consensusresearch" %% "scrypto" % "1.2.0-RC3",
     "com.madgag.spongycastle" % "core" % "1.54.0.0",
     "org.iq80.leveldb" % "leveldb" % "0.9",
-    "org.scorexfoundation" %% "iodb" % "0.2.0",
+    "org.scorexfoundation" %% "iodb" % "0.3.0",
     "ch.qos.logback" % "logback-classic" % "1.1.9",
     "org.scalatest" %% "scalatest" % "3.0.1" % "it,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",
+    "org.jline" % "jline" % "3.1.2",
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.5",
+    "io.circe" %% "circe-core" % circeVersion,
+    "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"
   )
 }
 
 val Integration = config("it") extend Test
 
+val Evm = config("evm") extend Test
+
 val root = project.in(file("."))
-  .configs(Integration)
-  .settings(commonSettings: _*)
-  .settings(libraryDependencies ++= dep)
-  .settings(inConfig(Integration)(Defaults.testSettings) : _*)
+    .configs(Integration)
+    .configs(Evm)
+    .settings(commonSettings: _*)
+    .settings(libraryDependencies ++= dep)
+    .settings(inConfig(Integration)(Defaults.testSettings) : _*)
+    .settings(inConfig(Evm)(Defaults.testSettings) : _*)
+
+scalacOptions := Seq(
+  "-unchecked",
+  "-deprecation",
+  "-feature",
+  "-Xfatal-warnings"
+)
+
+testOptions in Test += Tests.Argument("-oD")
 
-scalacOptions := Seq("-unchecked", "-deprecation", "-feature")
+(test in Evm) := (test in Evm).dependsOn(solidityCompile).value
+(sourceDirectory in Evm) := baseDirectory.value / "src" / "evmTest"
 
 (scalastyleConfig in Test) := baseDirectory.value / "scalastyle-test-config.xml"
 scalastyleSources in Test ++= {(unmanagedSourceDirectories in Integration).value}
+
+mainClass in Compile := Some("io.iohk.ethereum.App")
+
+coverageExcludedPackages := "io.iohk.ethereum.vmrunner.*"

circle.yml

@@ -0,0 +1,3 @@
+dependencies:
+  pre:
+    - sudo add-apt-repository -y ppa:ethereum/ethereum; sudo apt-get update; sudo apt-get install -y solc

project/SolidityPlugin.scala

@@ -0,0 +1,41 @@
+import java.io.PrintWriter
+
+import sbt.TaskKey
+import sbt._
+import Keys._
+
+object SolidityPlugin extends AutoPlugin {
+
+  object autoImport {
+    lazy val solidityCompile = TaskKey[Unit]("solidityCompile", "Compiles solidity contracts")
+  }
+
+  import autoImport._
+
+  override def projectSettings: Seq[Def.Setting[_]] = Seq(
+    solidityCompile := {
+      import sys.process._
+
+      val contractsDir = baseDirectory.value / "src" / "evmTest" / "resources" / "solidity"
+      val outDir = baseDirectory.value / "target" / "contracts"
+
+      (contractsDir ** "*.sol").get.foreach { f =>
+        Seq("solc", f.getPath, "--bin", "--overwrite", "-o", outDir.getPath).!!
+
+        // this is a temporary workaround, see: https://github.com/ethereum/solidity/issues/1732
+        val abiOut = Seq("solc", f.getPath, "--abi").!!
+        val abisLines = abiOut.split("\n").sliding(4, 4)
+        abisLines.foreach { abiLines =>
+          val contractName = abiLines(1)
+            .replace(f.getPath, "")
+            .dropWhile(_ != ':').drop(1)
+            .takeWhile(_ != ' ')
+          new PrintWriter(outDir / s"$contractName.abi") {
+            write(abiLines.drop(3).mkString); close()
+          }
+        }
+      }
+    }
+  )
+
+}

project/plugins.sbt

@@ -3,4 +3,4 @@ addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.0")
 addSbtPlugin("org.scoverage" %% "sbt-coveralls" % "1.1.0")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6")
-addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "latest.release")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "latest.release")

scalastyle-test-config.xml

@@ -24,7 +24,7 @@
             <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
         </parameters>
     </check>
-    <check level="error" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="true">
+    <check level="error" class="org.scalastyle.scalariform.ObjectNamesChecker" enabled="false">
         <parameters>
             <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
         </parameters>

src/evmTest/resources/solidity/CallSelfDestruct.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.4.10;
+
+contract CallSelfDestruct {
+
+  function callDestruct() {
+    CallSelfDestruct firstCall = CallSelfDestruct(this);
+    firstCall.doSelfdestruct();
+
+    CallSelfDestruct secondCall = CallSelfDestruct(this);
+    secondCall.doSelfdestruct();
+  }
+
+  function doSelfdestruct() {
+    selfdestruct(msg.sender);
+  }
+
+}

src/evmTest/resources/solidity/Caller.sol

@@ -0,0 +1,24 @@
+pragma solidity ^0.4.10;
+
+contract Callee {
+
+  uint foo = 2;
+
+  function setFoo(uint v) {
+    foo = v;
+  }
+
+  function getFoo() constant returns (uint) {
+      return foo;
+  }
+
+}
+
+contract Caller {
+
+  function makeACall(address calleeAddr, uint fooVal) {
+    Callee callee = Callee(calleeAddr);
+    callee.setFoo(fooVal);
+  }
+
+}

src/evmTest/resources/solidity/ContractCallingItself.sol

@@ -0,0 +1,20 @@
+pragma solidity ^0.4.10;
+
+contract ContractCallingItself {
+
+    uint someVar = 10;
+
+    function callSelf() {
+        address selfAddress = this;
+        ContractCallingItself selfContract = ContractCallingItself(selfAddress);
+        selfContract.doubleSomeVar();
+    }
+
+    function doubleSomeVar() {
+        someVar = someVar * 2;
+    }
+
+    function getSomeVar() constant returns (uint) {
+        return someVar;
+    }
+}

src/test/solidity/fibonacci.sol renamed to src/evmTest/resources/solidity/Fibonacci.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.8;
+pragma solidity ^0.4.10;
 
 contract Fibonacci {
     uint fib = 0;

src/evmTest/resources/solidity/MinimumViableToken.sol

@@ -0,0 +1,19 @@
+pragma solidity ^0.4.10;
+
+contract MinimumViableToken {
+    /* This creates an array with all balances */
+    mapping (address => uint256) public balanceOf;
+
+    /* Initializes contract with initial supply tokens to the creator of the contract */
+    function MinimumViableToken(uint256 initialSupply) {
+        balanceOf[msg.sender] = initialSupply;              // Give the creator all initial tokens
+    }
+
+    /* Send coins */
+    function transfer(address _to, uint256 _value) {
+        if (balanceOf[msg.sender] < _value) throw;           // Check if the sender has enough
+        if (balanceOf[_to] + _value < balanceOf[_to]) throw; // Check for overflows
+        balanceOf[msg.sender] -= _value;                     // Subtract from the sender
+        balanceOf[_to] += _value;                            // Add the same to the recipient
+    }
+}

src/evmTest/resources/solidity/MutualRecursion.sol

@@ -0,0 +1,18 @@
+pragma solidity ^0.4.10;
+
+contract MutualRecursion {
+
+    function isEven(uint n) returns (bool) {
+        if (n == 0)
+            return true;
+        else
+            return isOdd(n - 1);
+    }
+
+    function isOdd(uint n) returns (bool) {
+        if (n == 0)
+            return false;
+        else
+            return isEven(n - 1);
+    }
+}

src/evmTest/resources/solidity/PrecompiledContracts.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.4.10;
+
+contract PrecompiledContracts {
+  function usePrecompiledContracts(bytes32 hash, uint8 v, bytes32 r, bytes32 s) returns (bytes20) {
+
+    // there is no function alias for Identity contract and we cannot get the return data using low-level call:
+    // https://solidity.readthedocs.io/en/latest/types.html#address
+
+    return ripemd160(sha256(ecrecover(hash, v, r, s)));
+  }
+}
+
+

src/evmTest/resources/solidity/Throw.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.10;
+
+contract Throw {
+    function justThrow() {
+        throw;
+    }
+}

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

@@ -0,0 +1,20 @@
+package io.iohk.ethereum.vm
+
+import io.iohk.ethereum.vm.utils.EvmTestEnv
+import org.scalatest.{FreeSpec, Matchers}
+
+class CallSelfDestructSpec extends FreeSpec with Matchers {
+
+  "EVM running CallSelfDestruct contract" - {
+
+    "should refund only once" in new EvmTestEnv {
+      val (_, callSelfDestruct) = deployContract("CallSelfDestruct")
+
+      val callRes = callSelfDestruct.callDestruct().call()
+
+      callRes.error shouldBe None
+      callRes.gasRefund shouldBe 24000
+    }
+  }
+
+}

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

@@ -0,0 +1,22 @@
+package io.iohk.ethereum.vm
+
+import io.iohk.ethereum.vm.utils.EvmTestEnv
+import org.scalatest.{FreeSpec, Matchers}
+
+// scalastyle:off magic.number
+class CallerSpec extends FreeSpec with Matchers {
+
+  "EVM running Caller contract" - {
+
+    "should handle a call to Callee" in new EvmTestEnv {
+      val (_, callee) = deployContract("Callee")
+      val (_, caller) = deployContract("Caller")
+
+      val callRes = caller.makeACall(callee.address, 123).call()
+      callRes.error shouldBe None
+
+      callee.getFoo().call().returnData shouldBe UInt256(123).bytes
+    }
+  }
+
+}

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

@@ -0,0 +1,23 @@
+package io.iohk.ethereum.vm
+
+import io.iohk.ethereum.vm.utils.EvmTestEnv
+import org.scalatest.{FreeSpec, Matchers}
+
+// scalastyle:off magic.number
+class ContractCallingItselfSpec extends FreeSpec with Matchers {
+
+  "EVM running ContractCallingItself contract" - {
+
+    "should handle a call to itself" in new EvmTestEnv {
+      val (_, contract) = deployContract("ContractCallingItself")
+
+      contract.getSomeVar().call().returnData shouldBe UInt256(10).bytes
+
+      val result = contract.callSelf().call()
+      result.error shouldBe None
+
+      contract.getSomeVar().call().returnData shouldBe UInt256(20).bytes
+    }
+  }
+
+}

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

@@ -0,0 +1,35 @@
+package io.iohk.ethereum.vm
+
+import io.iohk.ethereum.vm.utils.EvmTestEnv
+import org.scalatest.{FreeSpec, Matchers}
+
+// scalastyle:off magic.number
+class FibonacciSpec extends FreeSpec with Matchers {
+
+  "EVM running Fibonacci contract" - {
+
+    "should handle getNewFib call" in new EvmTestEnv {
+      val (_, contract) = deployContract("Fibonacci")
+
+      val result = contract.getNewFib(5).call()
+
+      result.error shouldBe None
+      result.returnData shouldBe UInt256(5).bytes
+    }
+
+    "should allow storage write/read" in new EvmTestEnv {
+      val (_, contract) = deployContract("Fibonacci")
+
+      val getNewRes = contract.getNewFib(6).call()
+
+      getNewRes.error shouldBe None
+      contract.storage.load(UInt256(0)) shouldBe UInt256(8)
+
+      val getStoredRes = contract.getStoredFib().call()
+
+      getStoredRes.error shouldBe None
+      getStoredRes.returnData shouldBe UInt256(8).bytes
+    }
+  }
+
+}