Feature/pie 1502 ewp options cli (PegaSysEng#1255)

* EWP options management

- create `EthereumWireProtocolConfiguration` object to hold per request limits
- add `EthereumWireProtocolConfiguration` in `SynchronizerConfiguration`
- create `PositiveNumber` class to handle command line options representing a positive number (a request limit for example)
- add unit tests to cover the new options
fixes PIE-1502

* Update EthereumWireProtocolConfiguration.java

* Update PantheonCommandTest.java

* fix tests

* spotlessApply

* fix tests and javadoc

* Update pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

Co-Authored-By: abdelhamidbakhta <[email protected]>

* Update pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

Co-Authored-By: abdelhamidbakhta <[email protected]>

* Update pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

Co-Authored-By: abdelhamidbakhta <[email protected]>

* Update pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

Co-Authored-By: abdelhamidbakhta <[email protected]>

* fix

* fix PR discussion

* Update EthereumWireProtocolConfiguration.java

* fix PR 1246 discussion

PegaSysEng#1246 (comment)

consensus/ibftlegacy/src/main/java/tech/pegasys/pantheon/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java

@@ -15,6 +15,7 @@
 import static java.util.Collections.singletonList;
 
 import tech.pegasys.pantheon.ethereum.chain.Blockchain;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.p2p.wire.Capability;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
@@ -34,10 +35,7 @@ public Istanbul64ProtocolManager(
       final int txWorkers,
       final int computationWorkers,
       final MetricsSystem metricsSystem,
-      final int maxGetBlockHeaders,
-      final int maxGetBlockBodies,
-      final int maxGetReceipts,
-      final int maxGetNodeData) {
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
     super(
         blockchain,
         worldStateArchive,
@@ -47,10 +45,7 @@ public Istanbul64ProtocolManager(
         txWorkers,
         computationWorkers,
         metricsSystem,
-        maxGetBlockHeaders,
-        maxGetBlockBodies,
-        maxGetReceipts,
-        maxGetNodeData);
+        ethereumWireProtocolConfiguration);
   }
 
   public Istanbul64ProtocolManager(

ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManager.java

@@ -71,10 +71,7 @@ public EthProtocolManager(
       final int networkId,
       final boolean fastSyncEnabled,
       final EthScheduler scheduler,
-      final int maxGetBlockHeaders,
-      final int maxGetBlockBodies,
-      final int maxGetReceipts,
-      final int maxGetNodeData) {
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
     this.networkId = networkId;
     this.scheduler = scheduler;
     this.blockchain = blockchain;
@@ -90,14 +87,7 @@ public EthProtocolManager(
     this.blockBroadcaster = new BlockBroadcaster(ethContext);
 
     // Set up request handlers
-    new EthServer(
-        blockchain,
-        worldStateArchive,
-        ethMessages,
-        maxGetBlockHeaders,
-        maxGetBlockBodies,
-        maxGetReceipts,
-        maxGetNodeData);
+    new EthServer(blockchain, worldStateArchive, ethMessages, ethereumWireProtocolConfiguration);
   }
 
   public EthProtocolManager(
@@ -115,10 +105,7 @@ public EthProtocolManager(
         networkId,
         fastSyncEnabled,
         new EthScheduler(syncWorkers, txWorkers, computationWorkers, metricsSystem),
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA);
+        EthereumWireProtocolConfiguration.defaultConfig());
   }
 
   public EthProtocolManager(
@@ -130,20 +117,14 @@ public EthProtocolManager(
       final int txWorkers,
       final int computationWorkers,
       final MetricsSystem metricsSystem,
-      final int maxGetBlockHeaders,
-      final int maxGetBlockBodies,
-      final int maxGetReceipts,
-      final int maxGetNodeData) {
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
     this(
         blockchain,
         worldStateArchive,
         networkId,
         fastSyncEnabled,
         new EthScheduler(syncWorkers, txWorkers, computationWorkers, metricsSystem),
-        maxGetBlockHeaders,
-        maxGetBlockBodies,
-        maxGetReceipts,
-        maxGetNodeData);
+        ethereumWireProtocolConfiguration);
   }
 
   public EthContext ethContext() {

ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServer.java

@@ -51,26 +51,17 @@ class EthServer {
   private final Blockchain blockchain;
   private final WorldStateArchive worldStateArchive;
   private final EthMessages ethMessages;
-  private final int maxGetBlockHeaders;
-  private final int maxGetBlockBodies;
-  private final int maxGetReceipts;
-  private final int maxGetNodeData;
+  private final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration;
 
   EthServer(
       final Blockchain blockchain,
       final WorldStateArchive worldStateArchive,
       final EthMessages ethMessages,
-      final int maxGetBlockHeaders,
-      final int maxGetBlockBodies,
-      final int maxGetReceipts,
-      final int maxGetNodeData) {
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
     this.blockchain = blockchain;
     this.worldStateArchive = worldStateArchive;
     this.ethMessages = ethMessages;
-    this.maxGetBlockHeaders = maxGetBlockHeaders;
-    this.maxGetBlockBodies = maxGetBlockBodies;
-    this.maxGetReceipts = maxGetReceipts;
-    this.maxGetNodeData = maxGetNodeData;
+    this.ethereumWireProtocolConfiguration = ethereumWireProtocolConfiguration;
     this.setupListeners();
   }
 
@@ -82,10 +73,7 @@ class EthServer {
         blockchain,
         worldStateArchive,
         ethMessages,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS,
-        EthereumWireProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA);
+        EthereumWireProtocolConfiguration.defaultConfig());
   }
 
   private void setupListeners() {
@@ -99,7 +87,10 @@ private void handleGetBlockHeaders(final EthMessage message) {
     LOG.trace("Responding to GET_BLOCK_HEADERS request");
     try {
       final MessageData response =
-          constructGetHeadersResponse(blockchain, message.getData(), maxGetBlockHeaders);
+          constructGetHeadersResponse(
+              blockchain,
+              message.getData(),
+              ethereumWireProtocolConfiguration.getMaxGetBlockHeaders());
       message.getPeer().send(response);
     } catch (final RLPException e) {
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
@@ -112,7 +103,10 @@ private void handleGetBlockBodies(final EthMessage message) {
     LOG.trace("Responding to GET_BLOCK_BODIES request");
     try {
       final MessageData response =
-          constructGetBodiesResponse(blockchain, message.getData(), maxGetBlockBodies);
+          constructGetBodiesResponse(
+              blockchain,
+              message.getData(),
+              ethereumWireProtocolConfiguration.getMaxGetBlockBodies());
       message.getPeer().send(response);
     } catch (final RLPException e) {
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
@@ -125,7 +119,8 @@ private void handleGetReceipts(final EthMessage message) {
     LOG.trace("Responding to GET_RECEIPTS request");
     try {
       final MessageData response =
-          constructGetReceiptsResponse(blockchain, message.getData(), maxGetReceipts);
+          constructGetReceiptsResponse(
+              blockchain, message.getData(), ethereumWireProtocolConfiguration.getMaxGetReceipts());
       message.getPeer().send(response);
     } catch (final RLPException e) {
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
@@ -138,7 +133,10 @@ private void handleGetNodeData(final EthMessage message) {
     LOG.trace("Responding to GET_NODE_DATA request");
     try {
       final MessageData response =
-          constructGetNodeDataResponse(worldStateArchive, message.getData(), maxGetNodeData);
+          constructGetNodeDataResponse(
+              worldStateArchive,
+              message.getData(),
+              ethereumWireProtocolConfiguration.getMaxGetNodeData());
       message.getPeer().send(response);
     } catch (final RLPException e) {
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);

ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java

@@ -14,7 +14,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.util.uint.UInt256;
 
 import java.time.Duration;
@@ -66,9 +65,6 @@ public class SynchronizerConfiguration {
   private final int maxTrailingPeers;
   private final long worldStateMinMillisBeforeStalling;
 
-  // Ethereum Wire Procotol config
-  private final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration;
-
   private SynchronizerConfiguration(
       final int fastSyncPivotDistance,
       final float fastSyncFullValidationRate,
@@ -89,8 +85,7 @@ private SynchronizerConfiguration(
       final int downloaderParallelism,
       final int transactionsParallelism,
       final int computationParallelism,
-      final int maxTrailingPeers,
-      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
+      final int maxTrailingPeers) {
     this.fastSyncPivotDistance = fastSyncPivotDistance;
     this.fastSyncFullValidationRate = fastSyncFullValidationRate;
     this.fastSyncMinimumPeerCount = fastSyncMinimumPeerCount;
@@ -111,7 +106,6 @@ private SynchronizerConfiguration(
     this.transactionsParallelism = transactionsParallelism;
     this.computationParallelism = computationParallelism;
     this.maxTrailingPeers = maxTrailingPeers;
-    this.ethereumWireProtocolConfiguration = ethereumWireProtocolConfiguration;
   }
 
   public static Builder builder() {
@@ -222,17 +216,11 @@ public int getMaxTrailingPeers() {
     return maxTrailingPeers;
   }
 
-  public EthereumWireProtocolConfiguration getEthereumWireProtocolConfiguration() {
-    return ethereumWireProtocolConfiguration;
-  }
-
   public static class Builder {
     private SyncMode syncMode = SyncMode.FULL;
     private int fastSyncMinimumPeerCount = DEFAULT_FAST_SYNC_MINIMUM_PEERS;
     private Duration fastSyncMaximumPeerWaitTime = DEFAULT_FAST_SYNC_MAXIMUM_PEER_WAIT_TIME;
     private int maxTrailingPeers = Integer.MAX_VALUE;
-    private EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration =
-        EthereumWireProtocolConfiguration.defaultConfig();
 
     @CommandLine.Option(
         names = "--Xsynchronizer-block-propagation-range",
@@ -492,12 +480,6 @@ public Builder maxTrailingPeers(final int maxTailingPeers) {
       return this;
     }
 
-    public Builder ethereumWireProtocolConfiguration(
-        final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
-      this.ethereumWireProtocolConfiguration = ethereumWireProtocolConfiguration;
-      return this;
-    }
-
     public SynchronizerConfiguration build() {
       return new SynchronizerConfiguration(
           fastSyncPivotDistance,
@@ -519,8 +501,7 @@ public SynchronizerConfiguration build() {
           downloaderParallelism,
           transactionsParallelism,
           computationParallelism,
-          maxTrailingPeers,
-          ethereumWireProtocolConfiguration);
+          maxTrailingPeers);
     }
   }
 }

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTest.java

@@ -34,6 +34,7 @@
 import tech.pegasys.pantheon.ethereum.core.TransactionReceipt;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol.EthVersion;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.MockPeerConnection.PeerSendHandler;
 import tech.pegasys.pantheon.ethereum.eth.manager.ethtaskutils.BlockchainSetupUtil;
 import tech.pegasys.pantheon.ethereum.eth.messages.BlockBodiesMessage;
@@ -117,10 +118,7 @@ public void disconnectOnUnsolicitedMessage() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final MessageData messageData =
           BlockHeadersMessage.create(Collections.singletonList(blockchain.getBlockHeader(1).get()));
       final MockPeerConnection peer = setupPeer(ethManager, (cap, msg, conn) -> {});
@@ -141,10 +139,7 @@ public void disconnectOnFailureToSendStatusMessage() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final MessageData messageData =
           BlockHeadersMessage.create(Collections.singletonList(blockchain.getBlockHeader(1).get()));
       final MockPeerConnection peer =
@@ -166,10 +161,7 @@ public void disconnectOnWrongChainId() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final MessageData messageData =
           BlockHeadersMessage.create(Collections.singletonList(blockchain.getBlockHeader(1).get()));
       final MockPeerConnection peer =
@@ -202,10 +194,7 @@ public void disconnectOnWrongGenesisHash() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final MessageData messageData =
           BlockHeadersMessage.create(Collections.singletonList(blockchain.getBlockHeader(1).get()));
       final MockPeerConnection peer =
@@ -238,10 +227,7 @@ public void doNotDisconnectOnValidMessage() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final MessageData messageData =
           GetBlockBodiesMessage.create(Collections.singletonList(gen.hash()));
       final MockPeerConnection peer = setupPeer(ethManager, (cap, msg, conn) -> {});
@@ -266,10 +252,7 @@ public void respondToGetHeaders() throws ExecutionException, InterruptedExceptio
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long startBlock = 5L;
       final int blockCount = 5;
       final MessageData messageData =
@@ -310,10 +293,7 @@ public void respondToGetHeadersWithinLimits() throws ExecutionException, Interru
             1,
             1,
             new NoOpMetricsSystem(),
-            limit,
-            limit,
-            limit,
-            limit)) {
+            new EthereumWireProtocolConfiguration(limit, limit, limit, limit))) {
       final long startBlock = 5L;
       final int blockCount = 10;
       final MessageData messageData =
@@ -353,10 +333,7 @@ public void respondToGetHeadersReversed() throws ExecutionException, Interrupted
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long endBlock = 10L;
       final int blockCount = 5;
       final MessageData messageData = GetBlockHeadersMessage.create(endBlock, blockCount, 0, true);
@@ -395,10 +372,7 @@ public void respondToGetHeadersWithSkip() throws ExecutionException, Interrupted
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long startBlock = 5L;
       final int blockCount = 5;
       final int skip = 1;
@@ -440,10 +414,7 @@ public void respondToGetHeadersReversedWithSkip()
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long endBlock = 10L;
       final int blockCount = 5;
       final int skip = 1;
@@ -506,10 +477,7 @@ public void respondToGetHeadersPartial() throws ExecutionException, InterruptedE
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long startBlock = blockchain.getChainHeadBlockNumber() - 1L;
       final int blockCount = 5;
       final MessageData messageData =
@@ -549,10 +517,7 @@ public void respondToGetHeadersEmpty() throws ExecutionException, InterruptedExc
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long startBlock = blockchain.getChainHeadBlockNumber() + 1;
       final int blockCount = 5;
       final MessageData messageData =
@@ -589,10 +554,7 @@ public void respondToGetBodies() throws ExecutionException, InterruptedException
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       // Setup blocks query
       final long startBlock = blockchain.getChainHeadBlockNumber() - 5;
       final int blockCount = 2;
@@ -645,10 +607,7 @@ public void respondToGetBodiesWithinLimits() throws ExecutionException, Interrup
             1,
             1,
             new NoOpMetricsSystem(),
-            limit,
-            limit,
-            limit,
-            limit)) {
+            new EthereumWireProtocolConfiguration(limit, limit, limit, limit))) {
       // Setup blocks query
       final int blockCount = 10;
       final long startBlock = blockchain.getChainHeadBlockNumber() - blockCount;
@@ -700,10 +659,7 @@ public void respondToGetBodiesPartial() throws ExecutionException, InterruptedEx
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       // Setup blocks query
       final long expectedBlockNumber = blockchain.getChainHeadBlockNumber() - 1;
       final BlockHeader header = blockchain.getBlockHeader(expectedBlockNumber).get();
@@ -749,10 +705,7 @@ public void respondToGetReceipts() throws ExecutionException, InterruptedExcepti
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       // Setup blocks query
       final long startBlock = blockchain.getChainHeadBlockNumber() - 5;
       final int blockCount = 2;
@@ -804,10 +757,7 @@ public void respondToGetReceiptsWithinLimits() throws ExecutionException, Interr
             1,
             1,
             new NoOpMetricsSystem(),
-            limit,
-            limit,
-            limit,
-            limit)) {
+            new EthereumWireProtocolConfiguration(limit, limit, limit, limit))) {
       // Setup blocks query
       final int blockCount = 10;
       final long startBlock = blockchain.getChainHeadBlockNumber() - blockCount;
@@ -858,10 +808,7 @@ public void respondToGetReceiptsPartial() throws ExecutionException, Interrupted
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       // Setup blocks query
       final long blockNumber = blockchain.getChainHeadBlockNumber() - 5;
       final BlockHeader header = blockchain.getBlockHeader(blockNumber).get();
@@ -909,10 +856,7 @@ public void respondToGetNodeData() throws Exception {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       // Setup node data query
 
       final List<BytesValue> expectedResults = new ArrayList<>();
@@ -963,10 +907,7 @@ public void newBlockMinedSendsNewBlockMessageToAllPeers() {
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200);
+            EthereumWireProtocolConfiguration.defaultConfig());
 
     // Define handler to validate response
     final PeerSendHandler onSend = mock(PeerSendHandler.class);
@@ -1038,10 +979,7 @@ public void shouldSuccessfullyRespondToGetHeadersRequestLessThanZero()
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
       final long startBlock = 1L;
       final int requestedBlockCount = 13;
       final int receivedBlockCount = 2;
@@ -1106,10 +1044,7 @@ public void transactionMessagesGoToTheCorrectExecutor() {
             1,
             true,
             ethScheduler,
-            200,
-            200,
-            200,
-            200)) {
+            EthereumWireProtocolConfiguration.defaultConfig())) {
 
       // Create a transaction pool.  This has a side effect of registring a listener for the
       // transactions message.

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthProtocolManagerTestUtil.java

@@ -21,6 +21,7 @@
 import tech.pegasys.pantheon.ethereum.chain.ChainHead;
 import tech.pegasys.pantheon.ethereum.chain.GenesisState;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy;
 import tech.pegasys.pantheon.ethereum.mainnet.MainnetProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
@@ -44,7 +45,12 @@ public static EthProtocolManager create(
       final EthScheduler ethScheduler) {
     final int networkId = 1;
     return new EthProtocolManager(
-        blockchain, worldStateArchive, networkId, false, ethScheduler, 200, 200, 200, 200);
+        blockchain,
+        worldStateArchive,
+        networkId,
+        false,
+        ethScheduler,
+        EthereumWireProtocolConfiguration.defaultConfig());
   }
 
   public static EthProtocolManager create(

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/manager/EthServerTest.java

@@ -20,6 +20,7 @@
 
 import tech.pegasys.pantheon.ethereum.chain.Blockchain;
 import tech.pegasys.pantheon.ethereum.core.Hash;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.messages.GetNodeDataMessage;
 import tech.pegasys.pantheon.ethereum.eth.messages.NodeDataMessage;
 import tech.pegasys.pantheon.ethereum.worldstate.WorldStateArchive;
@@ -45,7 +46,11 @@ public class EthServerTest {
 
   @Before
   public void setUp() {
-    new EthServer(blockchain, worldStateArchive, ethMessages, 2, 2, 2, 2);
+    new EthServer(
+        blockchain,
+        worldStateArchive,
+        ethMessages,
+        new EthereumWireProtocolConfiguration(2, 2, 2, 2));
   }
 
   @Test

ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/transactions/TestNode.java

@@ -28,6 +28,7 @@
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
 import tech.pegasys.pantheon.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthContext;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
@@ -115,10 +116,7 @@ public TestNode(
             1,
             1,
             new NoOpMetricsSystem(),
-            200,
-            200,
-            200,
-            200);
+            EthereumWireProtocolConfiguration.defaultConfig());
 
     final NetworkRunner networkRunner =
         NetworkRunner.builder()

pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java

@@ -734,6 +734,7 @@ PantheonController<?> buildController() {
     try {
       return controllerBuilder
           .synchronizerConfiguration(buildSyncConfig())
+          .ethereumWireProtocolConfiguration(ethereumWireConfigurationBuilder.build())
           .rocksDbConfiguration(buildRocksDbConfiguration())
           .homePath(dataDir())
           .ethNetworkConfig(updateNetworkConfig(getNetwork()))
@@ -969,7 +970,6 @@ private SynchronizerConfiguration buildSyncConfig() {
         .fastSyncMinimumPeerCount(fastSyncMinPeerCount)
         .fastSyncMaximumPeerWaitTime(Duration.ofSeconds(fastSyncMaxWaitTime))
         .maxTrailingPeers(TrailingPeerRequirements.calculateMaxTrailingPeers(maxPeers))
-        .ethereumWireProtocolConfiguration(ethereumWireConfigurationBuilder.build())
         .build();
   }
 

pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonControllerBuilder.java

@@ -20,6 +20,7 @@
 import tech.pegasys.pantheon.ethereum.core.MiningParameters;
 import tech.pegasys.pantheon.ethereum.core.PendingTransactions;
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration;
 import tech.pegasys.pantheon.ethereum.storage.StorageProvider;
 import tech.pegasys.pantheon.ethereum.storage.keyvalue.RocksDbStorageProvider;
@@ -34,6 +35,7 @@
 public class PantheonControllerBuilder {
 
   private SynchronizerConfiguration synchronizerConfiguration;
+  private EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration;
   private RocksDbConfiguration rocksDbConfiguration;
   private Path homePath;
   private EthNetworkConfig ethNetworkConfig;
@@ -50,6 +52,12 @@ public PantheonControllerBuilder synchronizerConfiguration(
     return this;
   }
 
+  public PantheonControllerBuilder ethereumWireProtocolConfiguration(
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration) {
+    this.ethereumWireProtocolConfiguration = ethereumWireProtocolConfiguration;
+    return this;
+  }
+
   public PantheonControllerBuilder rocksDbConfiguration(
       final RocksDbConfiguration rocksDbConfiguration) {
     this.rocksDbConfiguration = rocksDbConfiguration;
@@ -116,6 +124,7 @@ public PantheonController<?> build() throws IOException {
     return PantheonController.fromConfig(
         genesisConfigFile,
         synchronizerConfiguration,
+        ethereumWireProtocolConfiguration,
         storageProvider,
         ethNetworkConfig.getNetworkId(),
         miningParameters,

pantheon/src/main/java/tech/pegasys/pantheon/controller/CliquePantheonController.java

@@ -41,6 +41,7 @@
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.eth.sync.DefaultSynchronizer;
 import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode;
@@ -109,6 +110,7 @@ static PantheonController<CliqueContext> init(
       final StorageProvider storageProvider,
       final GenesisConfigFile genesisConfig,
       final SynchronizerConfiguration syncConfig,
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration,
       final MiningParameters miningParams,
       final int networkId,
       final KeyPair nodeKeys,
@@ -157,10 +159,7 @@ static PantheonController<CliqueContext> init(
             syncConfig.transactionsParallelism(),
             syncConfig.computationParallelism(),
             metricsSystem,
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockHeaders(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockBodies(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetReceipts(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetNodeData());
+            ethereumWireProtocolConfiguration);
     final SyncState syncState =
         new SyncState(blockchain, ethProtocolManager.ethContext().getEthPeers());
     final Synchronizer synchronizer =

pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftLegacyPantheonController.java

@@ -35,6 +35,7 @@
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
 import tech.pegasys.pantheon.ethereum.core.Synchronizer;
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.eth.sync.DefaultSynchronizer;
 import tech.pegasys.pantheon.ethereum.eth.sync.SyncMode;
@@ -100,6 +101,7 @@ static PantheonController<IbftContext> init(
       final StorageProvider storageProvider,
       final GenesisConfigFile genesisConfig,
       final SynchronizerConfiguration syncConfig,
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration,
       final int networkId,
       final KeyPair nodeKeys,
       final Path dataDirectory,
@@ -147,7 +149,8 @@ static PantheonController<IbftContext> init(
             syncConfig.downloaderParallelism(),
             syncConfig.transactionsParallelism(),
             syncConfig.computationParallelism(),
-            metricsSystem);
+            metricsSystem,
+            ethereumWireProtocolConfiguration);
 
     final SyncState syncState =
         new SyncState(blockchain, istanbul64ProtocolManager.ethContext().getEthPeers());

pantheon/src/main/java/tech/pegasys/pantheon/controller/IbftPantheonController.java

@@ -61,6 +61,7 @@
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
 import tech.pegasys.pantheon.ethereum.core.Util;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthContext;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.eth.sync.DefaultSynchronizer;
@@ -137,6 +138,7 @@ static PantheonController<IbftContext> init(
       final StorageProvider storageProvider,
       final GenesisConfigFile genesisConfig,
       final SynchronizerConfiguration syncConfig,
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration,
       final MiningParameters miningParams,
       final int networkId,
       final KeyPair nodeKeys,
@@ -182,10 +184,7 @@ static PantheonController<IbftContext> init(
             syncConfig.transactionsParallelism(),
             syncConfig.computationParallelism(),
             metricsSystem,
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockHeaders(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockBodies(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetReceipts(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetNodeData());
+            ethereumWireProtocolConfiguration);
     final SubProtocol ethSubProtocol = EthProtocol.get();
 
     final EthContext ethContext = ethProtocolManager.ethContext();

pantheon/src/main/java/tech/pegasys/pantheon/controller/MainnetPantheonController.java

@@ -27,6 +27,7 @@
 import tech.pegasys.pantheon.ethereum.core.Synchronizer;
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
 import tech.pegasys.pantheon.ethereum.eth.EthProtocol;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthContext;
 import tech.pegasys.pantheon.ethereum.eth.manager.EthProtocolManager;
 import tech.pegasys.pantheon.ethereum.eth.peervalidation.DaoForkPeerValidator;
@@ -98,6 +99,7 @@ public static PantheonController<Void> init(
       final GenesisConfigFile genesisConfig,
       final ProtocolSchedule<Void> protocolSchedule,
       final SynchronizerConfiguration syncConfig,
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration,
       final MiningParameters miningParams,
       final int networkId,
       final KeyPair nodeKeys,
@@ -124,10 +126,7 @@ public static PantheonController<Void> init(
             syncConfig.transactionsParallelism(),
             syncConfig.computationParallelism(),
             metricsSystem,
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockHeaders(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetBlockBodies(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetReceipts(),
-            syncConfig.getEthereumWireProtocolConfiguration().getMaxGetNodeData());
+            ethereumWireProtocolConfiguration);
     final SyncState syncState =
         new SyncState(blockchain, ethProtocolManager.ethContext().getEthPeers());
     final Synchronizer synchronizer =

pantheon/src/main/java/tech/pegasys/pantheon/controller/PantheonController.java

@@ -23,6 +23,7 @@
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
 import tech.pegasys.pantheon.ethereum.core.Synchronizer;
 import tech.pegasys.pantheon.ethereum.core.TransactionPool;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration;
 import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApi;
 import tech.pegasys.pantheon.ethereum.jsonrpc.internal.methods.JsonRpcMethod;
@@ -45,6 +46,7 @@ public interface PantheonController<C> extends Closeable {
   static PantheonController<?> fromConfig(
       final GenesisConfigFile genesisConfigFile,
       final SynchronizerConfiguration syncConfig,
+      final EthereumWireProtocolConfiguration ethereumWireProtocolConfiguration,
       final StorageProvider storageProvider,
       final int networkId,
       final MiningParameters miningParameters,
@@ -63,6 +65,7 @@ static PantheonController<?> fromConfig(
           genesisConfigFile,
           MainnetProtocolSchedule.fromConfig(configOptions, privacyParameters),
           syncConfig,
+          ethereumWireProtocolConfiguration,
           miningParameters,
           networkId,
           nodeKeys,
@@ -76,6 +79,7 @@ static PantheonController<?> fromConfig(
           storageProvider,
           genesisConfigFile,
           syncConfig,
+          ethereumWireProtocolConfiguration,
           miningParameters,
           networkId,
           nodeKeys,
@@ -89,6 +93,7 @@ static PantheonController<?> fromConfig(
           storageProvider,
           genesisConfigFile,
           syncConfig,
+          ethereumWireProtocolConfiguration,
           networkId,
           nodeKeys,
           dataDirectory,
@@ -101,6 +106,7 @@ static PantheonController<?> fromConfig(
           storageProvider,
           genesisConfigFile,
           syncConfig,
+          ethereumWireProtocolConfiguration,
           miningParameters,
           networkId,
           nodeKeys,

pantheon/src/test/java/tech/pegasys/pantheon/PrivacyTest.java

@@ -55,10 +55,8 @@ public void privacyPrecompiled() throws IOException {
         (MainnetPantheonController)
             PantheonController.fromConfig(
                 GenesisConfigFile.mainnet(),
-                SynchronizerConfiguration.builder()
-                    .ethereumWireProtocolConfiguration(
-                        EthereumWireProtocolConfiguration.builder().build())
-                    .build(),
+                SynchronizerConfiguration.builder().build(),
+                EthereumWireProtocolConfiguration.defaultConfig(),
                 new InMemoryStorageProvider(),
                 1,
                 new MiningParametersTestBuilder().enabled(false).build(),

pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java

@@ -97,10 +97,7 @@ private void syncFromGenesis(final SyncMode mode) throws Exception {
     final int blockCount = 500;
     final KeyPair aheadDbNodeKeys = loadKeyPair(dbAhead);
     final SynchronizerConfiguration syncConfigAhead =
-        SynchronizerConfiguration.builder()
-            .syncMode(SyncMode.FULL)
-            .ethereumWireProtocolConfiguration(EthereumWireProtocolConfiguration.builder().build())
-            .build();
+        SynchronizerConfiguration.builder().syncMode(SyncMode.FULL).build();
     final MetricsSystem noOpMetricsSystem = new NoOpMetricsSystem();
     final int networkId = 2929;
 
@@ -111,6 +108,7 @@ private void syncFromGenesis(final SyncMode mode) throws Exception {
             GenesisConfigFile.mainnet(),
             MainnetProtocolSchedule.create(),
             syncConfigAhead,
+            EthereumWireProtocolConfiguration.defaultConfig(),
             new MiningParametersTestBuilder().enabled(false).build(),
             networkId,
             aheadDbNodeKeys,
@@ -129,6 +127,7 @@ private void syncFromGenesis(final SyncMode mode) throws Exception {
             GenesisConfigFile.mainnet(),
             MainnetProtocolSchedule.create(),
             syncConfigAhead,
+            EthereumWireProtocolConfiguration.defaultConfig(),
             new MiningParametersTestBuilder().enabled(false).build(),
             networkId,
             aheadDbNodeKeys,
@@ -185,6 +184,7 @@ private void syncFromGenesis(final SyncMode mode) throws Exception {
               GenesisConfigFile.mainnet(),
               MainnetProtocolSchedule.create(),
               syncConfigBehind,
+              EthereumWireProtocolConfiguration.defaultConfig(),
               new MiningParametersTestBuilder().enabled(false).build(),
               networkId,
               KeyPair.generate(),

pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java

@@ -105,6 +105,8 @@ public void initMocks() throws Exception {
     // doReturn used because of generic PantheonController
     Mockito.doReturn(mockController).when(mockControllerBuilder).build();
     when(mockControllerBuilder.synchronizerConfiguration(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.ethereumWireProtocolConfiguration(any()))
+        .thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.rocksDbConfiguration(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.homePath(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.ethNetworkConfig(any())).thenReturn(mockControllerBuilder);
@@ -120,8 +122,6 @@ public void initMocks() throws Exception {
     when(mockSyncConfBuilder.fastSyncMinimumPeerCount(anyInt())).thenReturn(mockSyncConfBuilder);
     when(mockSyncConfBuilder.fastSyncMaximumPeerWaitTime(any(Duration.class)))
         .thenReturn(mockSyncConfBuilder);
-    when(mockSyncConfBuilder.ethereumWireProtocolConfiguration(any()))
-        .thenReturn(mockSyncConfBuilder);
     when(mockSyncConfBuilder.build()).thenReturn(mockSyncConf);
 
     when(mockEthereumWireProtocolConfigurationBuilder.build())

pantheon/src/test/java/tech/pegasys/pantheon/util/BlockImporterTest.java

@@ -22,6 +22,7 @@
 import tech.pegasys.pantheon.ethereum.core.MiningParametersTestBuilder;
 import tech.pegasys.pantheon.ethereum.core.PendingTransactions;
 import tech.pegasys.pantheon.ethereum.core.PrivacyParameters;
+import tech.pegasys.pantheon.ethereum.eth.EthereumWireProtocolConfiguration;
 import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration;
 import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
 import tech.pegasys.pantheon.testutil.BlockTestUtil;
@@ -54,6 +55,7 @@ public void blockImport() throws IOException {
         PantheonController.fromConfig(
             GenesisConfigFile.mainnet(),
             SynchronizerConfiguration.builder().build(),
+            EthereumWireProtocolConfiguration.defaultConfig(),
             new InMemoryStorageProvider(),
             1,
             new MiningParametersTestBuilder().enabled(false).build(),
@@ -91,6 +93,7 @@ public void ibftImport() throws IOException {
         PantheonController.fromConfig(
             GenesisConfigFile.fromConfig(config),
             SynchronizerConfiguration.builder().build(),
+            EthereumWireProtocolConfiguration.defaultConfig(),
             new InMemoryStorageProvider(),
             10,
             new MiningParametersTestBuilder().enabled(false).build(),