Merge remote-tracking branch 'origin/develop' into ETCM-165-separate-rlp-sbt-project

Author: aakoshh

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -32,6 +32,7 @@ import io.iohk.ethereum.network.{
   KnownNodesManager,
   PeerEventBusActor,
   PeerManagerActor,
+  PeerStatisticsActor,
   ServerActor
 }
 import io.iohk.ethereum.nodebuilder.PruningConfigBuilder
@@ -140,15 +141,20 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
     override val connectMaxRetries: Int = 3
     override val connectRetryDelay: FiniteDuration = 1 second
     override val disconnectPoisonPillTimeout: FiniteDuration = 3 seconds
+    override val minOutgoingPeers = 5
     override val maxOutgoingPeers = 10
     override val maxIncomingPeers = 5
     override val maxPendingPeers = 5
+    override val pruneIncomingPeers = 0
+    override val minPruneAge = 1.minute
     override val networkId: Int = 1
 
     override val updateNodesInitialDelay: FiniteDuration = 5.seconds
     override val updateNodesInterval: FiniteDuration = 20.seconds
     override val shortBlacklistDuration: FiniteDuration = 1.minute
     override val longBlacklistDuration: FiniteDuration = 3.minutes
+    override val statSlotDuration: FiniteDuration = 1.minute
+    override val statSlotCount: Int = 30
   }
 
   lazy val peerEventBus = system.actorOf(PeerEventBusActor.props, "peer-event-bus")
@@ -167,12 +173,16 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
 
   lazy val authHandshaker: AuthHandshaker = AuthHandshaker(nodeKey, secureRandom)
 
+  lazy val peerStatistics =
+    system.actorOf(PeerStatisticsActor.props(peerEventBus, slotDuration = 1.minute, slotCount = 30))
+
   lazy val peerManager: ActorRef = system.actorOf(
     PeerManagerActor.props(
       peerDiscoveryManager,
       Config.Network.peer,
       peerEventBus,
       knownNodesManager,
+      peerStatistics,
       handshaker,
       authHandshaker,
       EthereumMessageDecoder,

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

@@ -18,6 +18,7 @@ import io.iohk.ethereum.ledger.{InMemoryWorldStateProxy, InMemoryWorldStateProxy
 import io.iohk.ethereum.mpt.MptNode
 import io.iohk.ethereum.network.EtcPeerManagerActor.PeerInfo
 import io.iohk.ethereum.network.PeerManagerActor.PeerConfiguration
+import io.iohk.ethereum.network.PeerStatisticsActor
 import io.iohk.ethereum.network.discovery.DiscoveryConfig
 import io.iohk.ethereum.network.handshaker.{EtcHandshaker, EtcHandshakerConfiguration, Handshaker}
 import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
@@ -52,14 +53,19 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
     override val waitForChainCheckTimeout: FiniteDuration = Config.Network.peer.waitForChainCheckTimeout
     override val fastSyncHostConfiguration: PeerManagerActor.FastSyncHostConfiguration =
       Config.Network.peer.fastSyncHostConfiguration
+    override val minOutgoingPeers: Int = Config.Network.peer.minOutgoingPeers
     override val maxOutgoingPeers: Int = Config.Network.peer.maxOutgoingPeers
     override val maxIncomingPeers: Int = Config.Network.peer.maxIncomingPeers
     override val maxPendingPeers: Int = Config.Network.peer.maxPendingPeers
+    override val pruneIncomingPeers: Int = Config.Network.peer.pruneIncomingPeers
+    override val minPruneAge: FiniteDuration = Config.Network.peer.minPruneAge
     override val networkId: Int = privateNetworkId
     override val updateNodesInitialDelay: FiniteDuration = 5.seconds
     override val updateNodesInterval: FiniteDuration = 20.seconds
     override val shortBlacklistDuration: FiniteDuration = 1.minute
     override val longBlacklistDuration: FiniteDuration = 3.minutes
+    override val statSlotDuration: FiniteDuration = 1.minute
+    override val statSlotCount: Int = 30
   }
 
   val actorSystem = ActorSystem("mantis_system")
@@ -91,17 +97,20 @@ object DumpChainApp extends App with NodeKeyBuilder with SecureRandomBuilder wit
 
   val peerMessageBus = actorSystem.actorOf(PeerEventBusActor.props)
 
+  val peerStatistics = actorSystem.actorOf(PeerStatisticsActor.props(peerMessageBus, 1.minute, 30))
+
   val peerManager = actorSystem.actorOf(
     PeerManagerActor.props(
       peerDiscoveryManager = actorSystem.deadLetters, // TODO: fixme
       peerConfiguration = peerConfig,
       peerMessageBus = peerMessageBus,
+      peerStatistics = peerStatistics,
       knownNodesManager = actorSystem.deadLetters, // TODO: fixme
       handshaker = handshaker,
       authHandshaker = authHandshaker,
       messageDecoder = EthereumMessageDecoder,
-      discoveryConfig,
-      Config.Network.protocolVersion
+      discoveryConfig = discoveryConfig,
+      bestProtocolVersion = Config.Network.protocolVersion
     ),
     "peer-manager"
   )

src/main/resources/application.conf

@@ -2,9 +2,6 @@ mantis {
   # Optionally augment the client ID sent in Hello messages.
   client-identity = null
 
-  # Version string (reported by an RPC method)
-  client-version = "mantis/v2.0"
-
   # Base directory where all the data used by the node is stored, including blockchain data and private keys
   datadir = ${user.home}"/.mantis/"${mantis.blockchains.network}
 
@@ -142,11 +139,22 @@ mantis {
       # Maximum MPT components in a single response message (as a blockchain host)
       max-mpt-components-per-message = 200
 
-      # Maximum number of peers this node can connect to
+      # Minimum number of peers this node tries to connect to at all times
+      min-outgoing-peers = 20
+
+      # Maximum number of peers this node can connect to at any time.
+      # It's a bit higher than max-incoming-peers so that the node can quickly churn through incompatible peers after startup.
       max-outgoing-peers = 50
 
-      # Maximum number of peers that can connect to this node
-      max-incoming-peers = 50
+      # Maximum number of peers that can connect to this node.
+      # Should be at least as much as `min-outgoing-peers` so on a network level `total(max-in) >= total(min-out)`
+      max-incoming-peers = 30
+
+      # Number of incoming peers to prune if we hit the maximum, to free up slots for new connections.
+      prune-incoming-peers = 10
+
+      # Minimum age of peers before they can be selected for pruning, and the minimum time to pass between pruning attempts.
+      min-prune-age = 30.minutes
 
       # Maximum number of peers that can be connecting to this node
       max-pending-peers = 20
@@ -163,6 +171,13 @@ mantis {
       # Peer which disconnect during tcp connection becouse of other reasons will not be retried for this long duration
       # other reasons include: timeout during connection, wrong protocol, incompatible network
       long-blacklist-duration = 30.minutes
+
+      # Resolution of moving window of peer statistics.
+      # Will be multiplied by `stat-slot-count` to give the overall length of peer statistics availability.
+      stat-slot-duration = 10.minutes
+
+      # How many slots of peer statistics to keep in the moving window, e.g. 60 * 1.minute to keep stats for the last hour with 1 minute resolution.
+      stat-slot-count = 72
     }
 
     rpc {
@@ -605,7 +620,8 @@ mantis {
 
 akka {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
-  loglevel = "DEBUG"
+  # Not using ${logging.logs-level} because it might be set to TRACE, which our version of Akka doesn't have.
+  loglevel = "INFO"
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
   logger-startup-timeout = 30s
   log-dead-letters = off
@@ -659,4 +675,7 @@ logging {
 
   # Logs filename
   logs-file = "mantis"
+
+  # Logs level
+  logs-level = "INFO"
 }

src/main/resources/logback.xml

@@ -8,6 +8,7 @@
     <load key="logging.json-output" as="ASJSON"/>
     <load key="logging.logs-dir" as="LOGSDIR"/>
     <load key="logging.logs-file" as="LOGSFILENAME"/>
+    <load key="logging.logs-level" as="LOGSLEVEL"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
@@ -43,7 +44,7 @@
 
     <appender name="METRICS" class="io.prometheus.client.logback.InstrumentedAppender" />
 
-    <root level="DEBUG">
+    <root level="${LOGSLEVEL}">
         <if condition='p("ASJSON").contains("true")'>
             <then>
                 <appender-ref ref="STASH" />
@@ -58,9 +59,9 @@
 
     <logger name="io.netty" level="WARN"/>
     <logger name="io.iohk.scalanet" level="INFO" />
-    <logger name="io.iohk.ethereum.network.rlpx.RLPxConnectionHandler" level="DEBUG" />
     <logger name="io.iohk.ethereum.blockchain.sync.SyncController" level="INFO" />
-    <logger name="io.iohk.ethereum.network.PeerActor" level="DEBUG" />
+    <logger name="io.iohk.ethereum.network.PeerActor" level="${LOGSLEVEL}" />
+    <logger name="io.iohk.ethereum.network.rlpx.RLPxConnectionHandler" level="${LOGSLEVEL}" />
     <logger name="io.iohk.ethereum.vm.VM" level="OFF" />
 
 </configuration>

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

@@ -7,6 +7,9 @@ case class BlockBody(transactionList: Seq[SignedTransaction], uncleNodesList: Se
   override def toString: String =
     s"BlockBody{ transactionList: $transactionList, uncleNodesList: $uncleNodesList }"
 
+  def toShortString: String =
+    s"BlockBody { transactionsList: ${transactionList.map(_.hashAsHexString)}, uncleNodesList: ${uncleNodesList.map(_.hashAsHexString)} }"
+
   lazy val numberOfTxs: Int = transactionList.size
 
   lazy val numberOfUncles: Int = uncleNodesList.size

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

@@ -2,7 +2,7 @@ package io.iohk.ethereum.domain
 
 import akka.util.ByteString
 
-trait TransactionOutcome
+sealed trait TransactionOutcome
 
 case class HashOutcome(stateHash: ByteString) extends TransactionOutcome
 

src/main/scala/io/iohk/ethereum/faucet/FaucetConfig.scala

@@ -34,7 +34,6 @@ case class FaucetConfig(
     txValue: BigInt,
     rpcClient: RpcClientConfig,
     keyStoreDir: String,
-    minRequestInterval: FiniteDuration,
     handlerTimeout: FiniteDuration,
     actorCommunicationMargin: FiniteDuration,
     supervisor: SupervisorConfig,
@@ -52,7 +51,6 @@ object FaucetConfig {
       txValue = faucetConfig.getLong("tx-value"),
       rpcClient = RpcClientConfig(faucetConfig.getConfig("rpc-client")),
       keyStoreDir = faucetConfig.getString("keystore-dir"),
-      minRequestInterval = faucetConfig.getDuration("min-request-interval").toMillis.millis,
       handlerTimeout = faucetConfig.getDuration("handler-timeout").toMillis.millis,
       actorCommunicationMargin = faucetConfig.getDuration("actor-communication-margin").toMillis.millis,
       supervisor = SupervisorConfig(faucetConfig),

src/main/scala/io/iohk/ethereum/jsonrpc/EthService.scala

@@ -11,9 +11,9 @@ import io.iohk.ethereum.consensus.blocks.PendingBlockAndState
 import io.iohk.ethereum.consensus.ethash.EthashUtils
 import io.iohk.ethereum.crypto._
 import io.iohk.ethereum.db.storage.TransactionMappingStorage.TransactionLocation
-import io.iohk.ethereum.domain.{BlockHeader, SignedTransaction, UInt256, _}
+import io.iohk.ethereum.domain.{BlockHeader, SignedTransaction, _}
 import io.iohk.ethereum.jsonrpc.AkkaTaskOps._
-import io.iohk.ethereum.jsonrpc.FilterManager.{FilterChanges, FilterLogs, LogFilterLogs, TxLog}
+import io.iohk.ethereum.jsonrpc.FilterManager.{FilterChanges, FilterLogs, LogFilterLogs}
 import io.iohk.ethereum.jsonrpc.server.controllers.JsonRpcBaseController.JsonRpcConfig
 import io.iohk.ethereum.jsonrpc.{FilterManager => FM}
 import io.iohk.ethereum.keystore.KeyStore
@@ -24,7 +24,6 @@ import io.iohk.ethereum.rlp
 import io.iohk.ethereum.rlp.RLPImplicitConversions._
 import io.iohk.ethereum.rlp.RLPImplicits._
 import io.iohk.ethereum.rlp.RLPList
-import io.iohk.ethereum.rlp.UInt256RLPImplicits._
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.transactions.PendingTransactionsManager.{PendingTransaction, PendingTransactionsResponse}
 import io.iohk.ethereum.utils._
@@ -346,39 +345,22 @@ class EthService(
         stx <- body.transactionList.lift(txIndex)
         receipts <- blockchain.getReceiptsByHash(blockHash)
         receipt: Receipt <- receipts.lift(txIndex)
+        // another possibility would be to throw an exception and fail hard, as if we cannot calculate sender for transaction
+        // included in blockchain it means that something is terribly wrong
+        sender <- SignedTransaction.getSender(stx)
       } yield {
-        // safe to call get as we are geting saved transaction with receipt (sender was proper formed)
-        val sender = SignedTransaction.getSender(stx)
-        val contractAddress = if (stx.tx.isContractInit && sender.isDefined) {
-          //do not subtract 1 from nonce because in transaction we have nonce of account before transaction execution
-          val hash = kec256(rlp.encode(RLPList(sender.get.bytes, UInt256(stx.tx.nonce).toRLPEncodable)))
-          Some(Address(hash))
-        } else {
-          None
-        }
+
+        val gasUsed =
+          if (txIndex == 0) receipt.cumulativeGasUsed
+          else receipt.cumulativeGasUsed - receipts(txIndex - 1).cumulativeGasUsed
 
         TransactionReceiptResponse(
-          transactionHash = stx.hash,
+          receipt = receipt,
+          stx = stx,
+          signedTransactionSender = sender,
           transactionIndex = txIndex,
-          blockNumber = header.number,
-          blockHash = header.hash,
-          cumulativeGasUsed = receipt.cumulativeGasUsed,
-          gasUsed =
-            if (txIndex == 0) receipt.cumulativeGasUsed
-            else receipt.cumulativeGasUsed - receipts(txIndex - 1).cumulativeGasUsed,
-          contractAddress = contractAddress,
-          logs = receipt.logs.zipWithIndex.map { case (txLog, index) =>
-            TxLog(
-              logIndex = index,
-              transactionIndex = txIndex,
-              transactionHash = stx.hash,
-              blockHash = header.hash,
-              blockNumber = header.number,
-              address = txLog.loggerAddress,
-              data = txLog.data,
-              topics = txLog.logTopics
-            )
-          }
+          blockHeader = header,
+          gasUsedByTransaction = gasUsed
         )
       }