[CHORE] Refactor block usage and location

build.sbt

@@ -133,3 +133,17 @@ jdkPackagerJVMArgs := Seq(
 )
 
 coverageExcludedPackages := "io\\.iohk\\.ethereum\\.extvm\\.msg.*"
+
+
+addCommandAlias(
+  "compile-all",
+  """;compile
+    |;test:compile
+    |;evm:compile
+    |;it:compile
+    |;ets:compile
+    |;rpcTest:compile
+    |;snappy:compile
+    |;benchmark:compile
+    |""".stripMargin
+)

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

@@ -5,7 +5,6 @@ import io.iohk.ethereum.ObjectGenerators
 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

src/ets/scala/io/iohk/ethereum/ets/blockchain/ScenarioSetup.scala

@@ -13,7 +13,6 @@ import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ets.common.AccountState
 import io.iohk.ethereum.ledger.Ledger.VMImpl
 import io.iohk.ethereum.ledger._
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.BigIntExtensionMethods._
 import io.iohk.ethereum.utils.{BlockchainConfig, Config}
 import org.bouncycastle.util.encoders.Hex

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainActor.scala

@@ -6,7 +6,8 @@ import java.net.URI
 import akka.actor.{Actor, ActorRef, _}
 import akka.util.ByteString
 import io.iohk.ethereum.crypto.kec256
-import io.iohk.ethereum.domain.{BlockHeader, Receipt}
+import io.iohk.ethereum.domain.{BlockBody, BlockHeader, Receipt}
+import io.iohk.ethereum.domain.BlockHeader._
 import io.iohk.ethereum.network.{Peer, PeerManagerActor}
 import io.iohk.ethereum.network.PeerActor.SendMessage
 import io.iohk.ethereum.network.PeerManagerActor.{GetPeers, Peers}
@@ -15,7 +16,6 @@ import io.iohk.ethereum.network.p2p.messages.PV63._
 import io.iohk.ethereum.network.p2p.messages.PV63.MptNodeEncoders._
 import org.bouncycastle.util.encoders.Hex
 import ReceiptImplicits._
-import BlockHeaderImplicits._
 import io.iohk.ethereum.mpt.{BranchNode, ExtensionNode, HashNode, LeafNode, MptNode}
 import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
 import io.iohk.ethereum.network.PeerEventBusActor.{PeerSelector, Subscribe}

src/it/scala/io/iohk/ethereum/txExecTest/util/DumpChainApp.scala

@@ -16,7 +16,6 @@ import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
-import io.iohk.ethereum.network.p2p.messages.PV62
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
 import io.iohk.ethereum.network.{ForkResolver, PeerEventBusActor, PeerManagerActor}
 import io.iohk.ethereum.nodebuilder.{AuthHandshakerBuilder, NodeKeyBuilder, SecureRandomBuilder}
@@ -111,13 +110,13 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
 
     override def getBlockHeaderByHash(hash: ByteString): Option[BlockHeader] = Some(new FakeHeader())
 
-    override def getBlockBodyByHash(hash: ByteString): Option[PV62.BlockBody] = ???
+    override def getBlockBodyByHash(hash: ByteString): Option[BlockBody] = ???
 
     override def getMptNodeByHash(hash: ByteString): Option[MptNode] = ???
 
     override def save(blockHeader: BlockHeader): Unit = ???
 
-    override def save(blockHash: ByteString, blockBody: PV62.BlockBody): Unit = ???
+    override def save(blockHash: ByteString, blockBody: BlockBody): Unit = ???
 
     override def save(blockHash: ByteString, receipts: Seq[Receipt]): Unit = ???
 

src/it/scala/io/iohk/ethereum/txExecTest/util/FixtureProvider.scala

@@ -6,9 +6,8 @@ import akka.util.ByteString
 import io.iohk.ethereum.db.dataSource.EphemDataSource
 import io.iohk.ethereum.db.storage._
 import io.iohk.ethereum.domain._
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody._
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
+import io.iohk.ethereum.domain.BlockHeader._
+import io.iohk.ethereum.domain.BlockBody._
 import io.iohk.ethereum.network.p2p.messages.PV63._
 import MptNodeEncoders._
 import ReceiptImplicits._

src/main/scala/io/iohk/ethereum/blockchain/data/GenesisDataLoader.scala

@@ -11,7 +11,6 @@ import io.iohk.ethereum.utils.Logger
 import io.iohk.ethereum.{crypto, rlp}
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.rlp.RLPImplicits._
 import org.json4s.{CustomSerializer, DefaultFormats, Formats, JString, JValue}
 import org.bouncycastle.util.encoders.Hex
@@ -135,7 +134,8 @@ class GenesisDataLoader(
       unixTimestamp = BigInt(genesisData.timestamp.replace("0x", ""), 16).toLong,
       extraData = genesisData.extraData,
       mixHash = genesisData.mixHash.getOrElse(zeros(hashLength)),
-      nonce = genesisData.nonce)
+      nonce = genesisData.nonce
+    )
 
   private def zeros(length: Int) =
     ByteString(Hex.decode(List.fill(length)("0").mkString))

src/main/scala/io/iohk/ethereum/blockchain/sync/SyncBlocksValidator.scala

@@ -3,8 +3,7 @@ package io.iohk.ethereum.blockchain.sync
 import akka.util.ByteString
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.consensus.validators.std.StdBlockValidator
-import io.iohk.ethereum.domain.{BlockHeader, Blockchain}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
+import io.iohk.ethereum.domain.{BlockHeader, BlockBody, Blockchain}
 import io.iohk.ethereum.consensus.validators.std.StdBlockValidator.BlockValid
 
 trait SyncBlocksValidator {

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcherState.scala

@@ -3,14 +3,15 @@ package io.iohk.ethereum.blockchain.sync.regular
 import akka.actor.ActorRef
 import akka.util.ByteString
 import cats.data.NonEmptyList
-import io.iohk.ethereum.domain.{Block, BlockHeader, HeadersSeq}
+import io.iohk.ethereum.domain.{Block, BlockHeader, BlockBody, HeadersSeq}
 import io.iohk.ethereum.network.{Peer, PeerId}
-import io.iohk.ethereum.network.p2p.messages.PV62.{BlockBody, BlockHash}
+import io.iohk.ethereum.network.p2p.messages.PV62.BlockHash
 import BlockFetcherState._
 import cats.syntax.either._
 import cats.syntax.option._
 
 import scala.collection.immutable.Queue
+
 case class BlockFetcherState(
     importer: ActorRef,
     readyBlocks: Queue[Block],

src/main/scala/io/iohk/ethereum/consensus/blocks/BlockGenerator.scala

@@ -19,7 +19,7 @@ trait BlockGenerator {
   /**
    * The type of consensus-specific data used in the block generation process.
    * For example, under [[io.iohk.ethereum.consensus.ethash.EthashConsensus EthashConsensus]],
-   * this represents the [[io.iohk.ethereum.network.p2p.messages.PV62.BlockBody#uncleNodesList ommers]].
+   * this represents the [[io.iohk.ethereum.domain.BlockBody#uncleNodesList ommers]].
    */
   type X
 

src/main/scala/io/iohk/ethereum/consensus/blocks/BlockGeneratorSkeleton.scala

@@ -11,11 +11,10 @@ import io.iohk.ethereum.crypto.kec256
 import io.iohk.ethereum.db.dataSource.EphemDataSource
 import io.iohk.ethereum.db.storage.StateStorage
 import io.iohk.ethereum.domain._
+import io.iohk.ethereum.consensus.ethash.blocks.OmmersSeqEnc
 import io.iohk.ethereum.ledger.Ledger.{BlockPreparationResult, BlockResult}
 import io.iohk.ethereum.ledger.{BlockPreparator, BloomFilter}
 import io.iohk.ethereum.mpt.{ByteArraySerializable, MerklePatriciaTrie}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
 import io.iohk.ethereum.utils.BlockchainConfig
 import io.iohk.ethereum.utils.ByteUtils.or
 

src/main/scala/io/iohk/ethereum/consensus/blocks/NoOmmersBlockGenerator.scala

@@ -3,7 +3,6 @@ package io.iohk.ethereum.consensus.blocks
 import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.{BlockPreparationError, BlockPreparator}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.BlockchainConfig
 
 

src/main/scala/io/iohk/ethereum/consensus/ethash/blocks/EthashBlockGenerator.scala

@@ -10,7 +10,6 @@ import io.iohk.ethereum.consensus.ethash.validators.EthashValidators
 import io.iohk.ethereum.crypto.kec256
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.ledger.{BlockPreparationError, BlockPreparator}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.BlockchainConfig
 
 

src/main/scala/io/iohk/ethereum/consensus/ethash/blocks/package.scala

@@ -3,6 +3,7 @@ package io.iohk.ethereum.consensus.ethash
 import io.iohk.ethereum.consensus.ethash.validators.OmmersValidator.OmmersError
 import io.iohk.ethereum.domain.BlockHeader
 import io.iohk.ethereum.ledger.BlockPreparationError
+import io.iohk.ethereum.rlp.{RLPEncodeable, RLPList, RLPSerializable}
 
 package object blocks {
   /**
@@ -13,5 +14,9 @@ package object blocks {
    */
   final type Ommers = Seq[BlockHeader]
 
+  implicit class OmmersSeqEnc(blockHeaders: Seq[BlockHeader]) extends RLPSerializable {
+    override def toRLPEncodable: RLPEncodeable = RLPList(blockHeaders.map(_.toRLPEncodable): _*)
+  }
+
   final case class InvalidOmmers(reason: OmmersError) extends BlockPreparationError
 }

src/main/scala/io/iohk/ethereum/consensus/validators/BlockValidator.scala

@@ -1,8 +1,7 @@
 package io.iohk.ethereum.consensus.validators
 
 import io.iohk.ethereum.consensus.validators.std.StdBlockValidator.{BlockError, BlockValid}
-import io.iohk.ethereum.domain.{BlockHeader, Receipt}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
+import io.iohk.ethereum.domain.{BlockHeader, BlockBody, Receipt}
 
 trait BlockValidator {
   def validateHeaderAndBody(blockHeader: BlockHeader, blockBody: BlockBody): Either[BlockError, BlockValid]

src/main/scala/io/iohk/ethereum/consensus/validators/std/StdBlockValidator.scala

@@ -2,10 +2,10 @@ package io.iohk.ethereum.consensus.validators
 package std
 
 import akka.util.ByteString
+import io.iohk.ethereum.consensus.ethash.blocks.OmmersSeqEnc
 import io.iohk.ethereum.crypto._
-import io.iohk.ethereum.domain.{Block, BlockHeader, Receipt, SignedTransaction}
+import io.iohk.ethereum.domain.{Block, BlockHeader, BlockBody, Receipt, SignedTransaction}
 import io.iohk.ethereum.ledger.BloomFilter
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.utils.ByteUtils.or
 
 
@@ -34,7 +34,6 @@ object StdBlockValidator extends BlockValidator {
    * @return Block if valid, a Some otherwise
    */
   private def validateOmmersHash(block: Block): Either[BlockError, BlockValid] = {
-    import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
     val encodedOmmers: Array[Byte] = block.body.uncleNodesList.toBytes
     if (kec256(encodedOmmers) sameElements block.header.ommersHash) Right(BlockValid)
     else Left(BlockOmmersHashError)

src/main/scala/io/iohk/ethereum/db/storage/BlockBodiesStorage.scala

@@ -7,8 +7,7 @@ import boopickle.Default.{ Pickle, Unpickle }
 import io.iohk.ethereum.crypto.ECDSASignature
 import io.iohk.ethereum.db.dataSource.DataSource
 import io.iohk.ethereum.db.storage.BlockBodiesStorage.BlockBodyHash
-import io.iohk.ethereum.domain.{ Address, BlockHeader, SignedTransaction, Transaction }
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
+import io.iohk.ethereum.domain.{ Address, BlockHeader, BlockBody, SignedTransaction, Transaction }
 import io.iohk.ethereum.utils.ByteUtils.compactPickledBytes
 
 /**

src/main/scala/io/iohk/ethereum/domain/Block.scala

@@ -1,7 +1,7 @@
 package io.iohk.ethereum.domain
 
 import akka.util.ByteString
-import io.iohk.ethereum.network.p2p.messages.PV62.{BlockBody, BlockHeaderImplicits}
+import io.iohk.ethereum.domain.BlockHeader._
 import io.iohk.ethereum.rlp.{RLPEncodeable, RLPList, RLPSerializable, rawDecode}
 
 /**
@@ -31,7 +31,6 @@ case class Block(header: BlockHeader, body: BlockBody) {
 object Block {
 
   implicit class BlockEnc(val obj: Block) extends RLPSerializable {
-    import BlockHeaderImplicits._
     import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
 
     override def toRLPEncodable: RLPEncodeable =  RLPList(
@@ -42,7 +41,6 @@ object Block {
   }
 
   implicit class BlockDec(val bytes: Array[Byte]) extends AnyVal {
-    import BlockHeaderImplicits._
     import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
     def toBlock: Block = rawDecode(bytes) match {
       case RLPList(header: RLPList, stx: RLPList, uncles: RLPList) => Block(

src/main/scala/io/iohk/ethereum/domain/BlockBody.scala

@@ -0,0 +1,70 @@
+package io.iohk.ethereum.domain
+
+import io.iohk.ethereum.domain.BlockHeader._
+import io.iohk.ethereum.rlp.{RLPEncodeable, RLPList, RLPSerializable, rawDecode}
+
+case class BlockBody(transactionList: Seq[SignedTransaction], uncleNodesList: Seq[BlockHeader]) {
+  override def toString: String =
+    s"""BlockBody{
+       |transactionList: $transactionList
+       |uncleNodesList: $uncleNodesList
+       |}
+    """.stripMargin
+}
+
+object BlockBody {
+
+  val empty = BlockBody(Seq.empty, Seq.empty)
+
+  def blockBodyToRlpEncodable(blockBody: BlockBody,
+                              signedTxToRlpEncodable: SignedTransaction => RLPEncodeable,
+                              blockHeaderToRlpEncodable: BlockHeader => RLPEncodeable
+                             ): RLPEncodeable =
+    RLPList(
+      RLPList(blockBody.transactionList.map(signedTxToRlpEncodable): _*),
+      RLPList(blockBody.uncleNodesList.map(blockHeaderToRlpEncodable): _*)
+    )
+
+  implicit class BlockBodyEnc(msg: BlockBody) extends RLPSerializable {
+    override def toRLPEncodable: RLPEncodeable = {
+      import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+
+      blockBodyToRlpEncodable(
+        msg,
+        stx => SignedTransactionEnc(stx).toRLPEncodable,
+        header => BlockHeaderEnc(header).toRLPEncodable
+      )
+    }
+  }
+
+  implicit class BlockBlodyDec(val bytes: Array[Byte]) extends AnyVal {
+    def toBlockBody: BlockBody = BlockBodyRLPEncodableDec(rawDecode(bytes)).toBlockBody
+  }
+
+  def rlpEncodableToBlockBody(rlpEncodeable: RLPEncodeable,
+                              rlpEncodableToSignedTransaction: RLPEncodeable => SignedTransaction,
+                              rlpEncodableToBlockHeader: RLPEncodeable => BlockHeader
+                             ): BlockBody =
+    rlpEncodeable match {
+      case RLPList((transactions: RLPList), (uncles: RLPList)) =>
+        BlockBody(
+          transactions.items.map(rlpEncodableToSignedTransaction),
+          uncles.items.map(rlpEncodableToBlockHeader)
+        )
+      case _ => throw new RuntimeException("Cannot decode BlockBody")
+    }
+
+  implicit class BlockBodyRLPEncodableDec(val rlpEncodeable: RLPEncodeable) {
+    def toBlockBody: BlockBody = {
+      import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
+
+      rlpEncodableToBlockBody(
+        rlpEncodeable,
+        rlp => SignedTransactionRlpEncodableDec(rlp).toSignedTransaction,
+        rlp => BlockheaderEncodableDec(rlp).toBlockHeader
+      )
+
+    }
+  }
+
+}

src/main/scala/io/iohk/ethereum/domain/BlockHeader.scala

@@ -2,8 +2,9 @@ package io.iohk.ethereum.domain
 
 import akka.util.ByteString
 import io.iohk.ethereum.crypto.kec256
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockHeaderImplicits._
-import io.iohk.ethereum.rlp.{RLPList, encode => rlpEncode}
+import io.iohk.ethereum.rlp.RLPImplicitConversions._
+import io.iohk.ethereum.rlp.RLPImplicits._
+import io.iohk.ethereum.rlp.{RLPEncodeable, RLPList, RLPSerializable, rawDecode, encode => rlpEncode}
 import org.bouncycastle.util.encoders.Hex
 
 case class BlockHeader(
@@ -66,4 +67,27 @@ object BlockHeader {
     }
     rlpEncode(rlpEncoded)
   }
+
+  implicit class BlockHeaderEnc(blockHeader: BlockHeader) extends RLPSerializable {
+    override def toRLPEncodable: RLPEncodeable = {
+      import blockHeader._
+      RLPList(parentHash, ommersHash, beneficiary, stateRoot, transactionsRoot, receiptsRoot,
+        logsBloom, difficulty, number, gasLimit, gasUsed, unixTimestamp, extraData, mixHash, nonce)
+    }
+  }
+
+  implicit class BlockheaderDec(val bytes: Array[Byte]) extends AnyVal {
+    def toBlockHeader: BlockHeader = BlockheaderEncodableDec(rawDecode(bytes)).toBlockHeader
+  }
+
+  implicit class BlockheaderEncodableDec(val rlpEncodeable: RLPEncodeable) extends AnyVal {
+    def toBlockHeader: BlockHeader = {
+      rlpEncodeable match {
+        case RLPList(parentHash, ommersHash, beneficiary, stateRoot, transactionsRoot, receiptsRoot,
+        logsBloom, difficulty, number, gasLimit, gasUsed, unixTimestamp, extraData, mixHash, nonce) =>
+          BlockHeader(parentHash, ommersHash, beneficiary, stateRoot, transactionsRoot, receiptsRoot,
+            logsBloom, difficulty, number, gasLimit, gasUsed, unixTimestamp, extraData, mixHash, nonce)
+      }
+    }
+  }
 }

src/main/scala/io/iohk/ethereum/domain/Blockchain.scala

@@ -11,8 +11,8 @@ import io.iohk.ethereum.db.storage.pruning.PruningMode
 import io.iohk.ethereum.domain
 import io.iohk.ethereum.ledger.{InMemoryWorldStateProxy, InMemoryWorldStateProxyStorage}
 import io.iohk.ethereum.mpt.{MerklePatriciaTrie, MptNode}
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 import io.iohk.ethereum.vm.{Storage, WorldStateProxy}
+
 /**
   * Entity to be used to persist and query  Blockchain related objects (blocks, transactions, ommers)
   */
@@ -41,7 +41,7 @@ trait Blockchain {
     * Allows to query a blockBody by block hash
     *
     * @param hash of the block that's being searched
-    * @return [[io.iohk.ethereum.network.p2p.messages.PV62.BlockBody]] if found
+    * @return [[io.iohk.ethereum.domain.BlockBody]] if found
     */
   def getBlockBodyByHash(hash: ByteString): Option[BlockBody]
 

src/main/scala/io/iohk/ethereum/domain/SignedTransaction.scala

@@ -15,7 +15,6 @@ import org.bouncycastle.crypto.AsymmetricCipherKeyPair
 import org.bouncycastle.crypto.params.ECPublicKeyParameters
 import org.bouncycastle.util.encoders.Hex
 import io.iohk.ethereum.network.p2p.messages.CommonMessages.SignedTransactions._
-import io.iohk.ethereum.network.p2p.messages.PV62.BlockBody
 
 import scala.concurrent.{ExecutionContext, Future}