Merge remote-tracking branch 'origin/phase/3/txExecution' into fix/ECDSASignature

Author: adamsmo

src/main/scala/io/iohk/ethereum/vm/OpCode.scala

@@ -163,8 +163,11 @@ object OpCodes {
 }
 
 object OpCode {
-  def sliceBytes(bytes: ByteString, offset: Int, size: Int): ByteString =
-    bytes.slice(offset, offset + size).padTo(size, 0.toByte)
+  def sliceBytes(bytes: ByteString, offset: UInt256, size: UInt256): ByteString = {
+    val start = offset.min(bytes.size).toInt
+    val end = (offset + size).min(bytes.size).toInt
+    bytes.slice(start, end).padTo(size.toInt, 0.toByte)
+  }
 }
 
 /**
@@ -338,7 +341,7 @@ case object CALLVALUE extends ConstOp(0x34)(_.env.value)
 case object CALLDATALOAD extends OpCode(0x35, 1, 1, _.G_verylow) with ConstGas {
   protected def exec[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): ProgramState[W, S] = {
     val (offset, stack1) = state.stack.pop
-    val data = OpCode.sliceBytes(state.inputData, offset.toInt, 32)
+    val data = OpCode.sliceBytes(state.inputData, offset, 32)
     val stack2 = stack1.push(UInt256(data))
     state.withStack(stack2).step()
   }
@@ -349,7 +352,7 @@ case object CALLDATASIZE extends ConstOp(0x36)(_.inputData.size)
 case object CALLDATACOPY extends OpCode(0x37, 3, 0, _.G_verylow) {
   protected def exec[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): ProgramState[W, S] = {
     val (Seq(memOffset, dataOffset, size), stack1) = state.stack.pop(3)
-    val data = OpCode.sliceBytes(state.inputData, dataOffset.toInt, size.toInt)
+    val data = OpCode.sliceBytes(state.inputData, dataOffset, size)
     val mem1 = state.memory.store(memOffset, data)
     state.withStack(stack1).withMemory(mem1).step()
   }
@@ -367,7 +370,7 @@ case object CODESIZE extends ConstOp(0x38)(_.env.program.length)
 case object CODECOPY extends OpCode(0x39, 3, 0, _.G_verylow) {
   protected def exec[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): ProgramState[W, S] = {
     val (Seq(memOffset, codeOffset, size), stack1) = state.stack.pop(3)
-    val bytes = state.program.getBytes(codeOffset.toInt, size.toInt)
+    val bytes = OpCode.sliceBytes(state.program.code, codeOffset, size)
     val mem1 = state.memory.store(memOffset, bytes)
     state.withStack(stack1).withMemory(mem1).step()
   }
@@ -394,7 +397,7 @@ case object EXTCODESIZE extends OpCode(0x3b, 1, 1, _.G_extcode) with ConstGas {
 case object EXTCODECOPY extends OpCode(0x3c, 4, 0, _.G_extcode) {
   protected def exec[W <: WorldStateProxy[W, S], S <: Storage[S]](state: ProgramState[W, S]): ProgramState[W, S] = {
     val (Seq(address, memOffset, codeOffset, size), stack1) = state.stack.pop(4)
-    val codeCopy = OpCode.sliceBytes(state.world.getCode(Address(address)), codeOffset.toInt, size.toInt)
+    val codeCopy = OpCode.sliceBytes(state.world.getCode(Address(address)), codeOffset, size)
     val mem1 = state.memory.store(memOffset, codeCopy)
     state.withStack(stack1).withMemory(mem1).step()
   }
@@ -798,7 +801,8 @@ sealed abstract class CallOp(code: Int, delta: Int, alpha: Int) extends OpCode(c
 
     } else {
       val stack2 = stack1.push(UInt256.One)
-      val output = result.returnData.take(outSize.toInt)
+      val sizeCap = outSize.min(result.returnData.size).toInt
+      val output = result.returnData.take(sizeCap)
       val mem2 = mem1.store(outOffset, output).expand(outOffset, outSize)
 
       state

src/test/scala/io/iohk/ethereum/vm/OpCodeFunSpec.scala

@@ -183,7 +183,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
       withStackVerification(op, stateIn, stateOut) {
         val (offset, _) = stateIn.stack.pop
         val (data, _) = stateOut.stack.pop
-        data shouldEqual UInt256(OpCode.sliceBytes(stateIn.inputData, offset.toInt, 32))
+        data shouldEqual UInt256(OpCode.sliceBytes(stateIn.inputData, offset, 32))
 
         val expectedState = stateIn.withStack(stateOut.stack).step()
         stateOut shouldEqual expectedState
@@ -203,7 +203,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
       withStackVerification(op, stateIn, stateOut) {
         val (Seq(memOffset, dataOffset, size), _) = stateIn.stack.pop(3)
-        val data = OpCode.sliceBytes(stateIn.inputData, dataOffset.toInt, size.toInt)
+        val data = OpCode.sliceBytes(stateIn.inputData, dataOffset, size)
         val (storedInMem, _) = stateOut.memory.load(memOffset, size)
         data shouldEqual storedInMem
 
@@ -225,7 +225,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
       withStackVerification(op, stateIn, stateOut) {
         val (Seq(memOffset, codeOffset, size), _) = stateIn.stack.pop(3)
-        val code = stateIn.program.getBytes(codeOffset.toInt, size.toInt)
+        val code = OpCode.sliceBytes(stateIn.program.code, codeOffset, size)
         val (storedInMem, _) = stateOut.memory.load(memOffset, size)
         code shouldEqual storedInMem
 
@@ -284,7 +284,7 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
       withStackVerification(op, stateIn, stateOut) {
         val (Seq(addr, memOffset, codeOffset, size), _) = stateIn.stack.pop(4)
-        val code = OpCode.sliceBytes(stateIn.world.getCode(Address(addr)), codeOffset.toInt, size.toInt)
+        val code = OpCode.sliceBytes(stateIn.world.getCode(Address(addr)), codeOffset, size)
         val (storedInMem, _) = stateOut.memory.load(memOffset, size)
         code shouldEqual storedInMem
 
@@ -670,5 +670,46 @@ class OpCodeFunSpec extends FunSuite with OpCodeTesting with Matchers with Prope
 
   verifyAllOpCodesRegistered(except = CREATE, CALL, CALLCODE, DELEGATECALL)
 
+  test("sliceBytes helper") {
+    def zeroes(i: Int): ByteString =
+      ByteString(Array.fill[Byte](i)(0))
+
+    val table = Table[Int, UInt256, UInt256, Int, ByteString => ByteString](
+      ("dataSize", "sliceOffset", "sliceSize", "expectedSize", "expectedContentFn"),
+
+      // both offset and size are greater than data size
+      (0, 16, 32, 32, _ => zeroes(32)),
+
+      // offset is within bounds, offset + size is greater than data size
+      (20, 16, 32, 32, bs => bs.drop(16) ++ zeroes(28)),
+
+      // offset + size are within bounds
+      (64, 16, 31, 31, bs => bs.slice(16, 47)),
+
+      // offset is greater than Int.MaxValue
+      (64, Two ** 128, 32, 32, _ => zeroes(32)),
+
+      // offset is within bounds, size is greater than Int.MaxValue
+      (64, 16, Two ** 64 + 7, 48, bs => bs.drop(16)),
+
+      // offset is within bounds, size is greater than Int.MaxValue and size.toInt > dataSize
+      // this case a bit strange because we purposefully let size overflow when converting to Int
+      // but sliceBytes is supposed to copy the behaviour of geth:
+      // https://github.com/ethereum/go-ethereum/blob/5f7826270c9e87509fd7731ec64953a5e4761de0/core/vm/common.go#L42
+      (64, 40, Two ** 64 + 124, 124, bs => bs.drop(40) ++ zeroes(100)),
+
+      // both offset and size are greater than Int.MaxValue
+      (64, Two ** 33, Two ** 96 + 13, 13, _ => zeroes(13))
+    )
+
+    forAll(table) { (dataSize, sliceOffset, sliceSize, expectedSize, expectedContentFn) =>
+      val bytes = getByteStringGen(dataSize, dataSize).sample.get
+      val slice = OpCode.sliceBytes(bytes, sliceOffset, sliceSize)
+
+      slice.size shouldEqual expectedSize
+      slice shouldEqual expectedContentFn(bytes)
+    }
+  }
+
 }