Merge branch 'master' into ibft_vtc

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/NodeConfiguration.java

@@ -38,4 +38,6 @@ public interface NodeConfiguration {
   Optional<EthNetworkConfig> ethNetworkConfig();
 
   void ethNetworkConfig(Optional<EthNetworkConfig> ethNetworkConfig);
+
+  boolean isBootnode();
 }

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java

@@ -86,6 +86,7 @@ public class PantheonNode implements Node, NodeConfiguration, RunnableNode, Auto
   private final GenesisConfigProvider genesisConfigProvider;
   private final boolean devMode;
   private final boolean discoveryEnabled;
+  private final boolean isBootnode;
 
   private List<String> bootnodes = new ArrayList<>();
   private JsonRequestFactories jsonRequestFactories;
@@ -105,7 +106,8 @@ public PantheonNode(
       final GenesisConfigProvider genesisConfigProvider,
       final int p2pPort,
       final Boolean p2pEnabled,
-      final boolean discoveryEnabled)
+      final boolean discoveryEnabled,
+      final boolean isBootnode)
       throws IOException {
     this.homeDirectory = Files.createTempDirectory("acctest");
     this.keyPair = KeyPairUtil.loadKeyPair(homeDirectory);
@@ -120,6 +122,7 @@ public PantheonNode(
     this.devMode = devMode;
     this.p2pEnabled = p2pEnabled;
     this.discoveryEnabled = discoveryEnabled;
+    this.isBootnode = isBootnode;
     LOG.info("Created PantheonNode {}", this.toString());
   }
 
@@ -429,6 +432,11 @@ public boolean isDiscoveryEnabled() {
     return discoveryEnabled;
   }
 
+  @Override
+  public boolean isBootnode() {
+    return isBootnode;
+  }
+
   Optional<PermissioningConfiguration> getPermissioningConfiguration() {
     return permissioningConfiguration;
   }

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java

@@ -66,7 +66,9 @@ public void start(final List<? extends RunnableNode> nodes) {
 
     for (final RunnableNode node : nodes) {
       this.nodes.put(node.getName(), node);
-      bootNodes.add(node.getConfiguration().enodeUrl());
+      if (node.getConfiguration().isBootnode()) {
+        bootNodes.add(node.getConfiguration().enodeUrl());
+      }
     }
 
     for (final RunnableNode node : nodes) {

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonFactoryConfiguration.java

@@ -33,6 +33,7 @@ class PantheonFactoryConfiguration {
   private final GenesisConfigProvider genesisConfigProvider;
   private final Boolean p2pEnabled;
   private final boolean discoveryEnabled;
+  private final boolean isBootnode;
 
   PantheonFactoryConfiguration(
       final String name,
@@ -44,7 +45,8 @@ class PantheonFactoryConfiguration {
       final boolean devMode,
       final GenesisConfigProvider genesisConfigProvider,
       final Boolean p2pEnabled,
-      final boolean discoveryEnabled) {
+      final boolean discoveryEnabled,
+      final boolean isBootnode) {
     this.name = name;
     this.miningParameters = miningParameters;
     this.jsonRpcConfiguration = jsonRpcConfiguration;
@@ -55,6 +57,7 @@ class PantheonFactoryConfiguration {
     this.genesisConfigProvider = genesisConfigProvider;
     this.p2pEnabled = p2pEnabled;
     this.discoveryEnabled = discoveryEnabled;
+    this.isBootnode = isBootnode;
   }
 
   public String getName() {
@@ -96,4 +99,8 @@ public GenesisConfigProvider getGenesisConfigProvider() {
   public Boolean getP2pEnabled() {
     return p2pEnabled;
   }
+
+  public boolean isBootnode() {
+    return isBootnode;
+  }
 }

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonFactoryConfigurationBuilder.java

@@ -24,6 +24,7 @@
 
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.Optional;
 
 public class PantheonFactoryConfigurationBuilder {
@@ -39,6 +40,7 @@ public class PantheonFactoryConfigurationBuilder {
   private GenesisConfigProvider genesisConfigProvider = ignore -> Optional.empty();
   private Boolean p2pEnabled = true;
   private boolean discoveryEnabled = true;
+  private boolean isBootnode = true;
 
   public PantheonFactoryConfigurationBuilder setName(final String name) {
     this.name = name;
@@ -99,6 +101,7 @@ public PantheonFactoryConfigurationBuilder webSocketEnabled() {
     final WebSocketConfiguration config = WebSocketConfiguration.createDefault();
     config.setEnabled(true);
     config.setPort(0);
+    config.setHostsWhitelist(Collections.singleton("*"));
 
     this.webSocketConfiguration = config;
     return this;
@@ -144,6 +147,11 @@ public PantheonFactoryConfigurationBuilder setDiscoveryEnabled(final boolean dis
     return this;
   }
 
+  public PantheonFactoryConfigurationBuilder setIsBootnode(final boolean isBootnode) {
+    this.isBootnode = isBootnode;
+    return this;
+  }
+
   public PantheonFactoryConfiguration build() {
     return new PantheonFactoryConfiguration(
         name,
@@ -155,6 +163,7 @@ public PantheonFactoryConfiguration build() {
         devMode,
         genesisConfigProvider,
         p2pEnabled,
-        discoveryEnabled);
+        discoveryEnabled,
+        isBootnode);
   }
 }

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java

@@ -64,7 +64,8 @@ private PantheonNode create(final PantheonFactoryConfiguration config) throws IO
             config.getGenesisConfigProvider(),
             serverSocket.getLocalPort(),
             config.getP2pEnabled(),
-            config.isDiscoveryEnabled());
+            config.isDiscoveryEnabled(),
+            config.isBootnode());
     serverSocket.close();
 
     return node;
@@ -104,6 +105,16 @@ public PantheonNode createArchiveNode(final String name) throws IOException {
             .build());
   }
 
+  public PantheonNode createNonBootnodeArchiveNode(final String name) throws IOException {
+    return create(
+        new PantheonFactoryConfigurationBuilder()
+            .setName(name)
+            .jsonRpcEnabled()
+            .webSocketEnabled()
+            .setIsBootnode(false)
+            .build());
+  }
+
   public PantheonNode createArchiveNodeWithDiscoveryDisabledAndAdmin(final String name)
       throws IOException {
     return create(

acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/permissioning/NodesWhitelistAcceptanceTest.java

@@ -40,7 +40,7 @@ public void setUp() throws Exception {
 
     permissionedCluster = new Cluster(clusterConfiguration, net);
     forbiddenNode = pantheon.createArchiveNode("forbidden-node");
-    allowedNode = pantheon.createArchiveNode("allowed-node");
+    allowedNode = pantheon.createNonBootnodeArchiveNode("allowed-node");
     permissionedNode =
         pantheon.createNodeWithNodesWhitelist(
             "permissioned-node", Collections.singletonList(getEnodeURI(allowedNode)));

build.gradle

@@ -333,9 +333,21 @@ run {
 }
 
 startScripts {
+
+  def shortenWindowsClasspath = { line ->
+    line = line.replaceAll(/^set CLASSPATH=.*$/, "set CLASSPATH=%APP_HOME%/lib/*")
+  }
+
   doLast {
     unixScript.text = unixScript.text.replace('PANTHEON_HOME', '\$APP_HOME')
     windowsScript.text = windowsScript.text.replace('PANTHEON_HOME', '%~dp0..')
+
+    // Prevent the error originating from the 8191 chars limit on Windows
+    windowsScript.text =
+      windowsScript
+      .readLines()
+      .collect(shortenWindowsClasspath)
+      .join('\r\n')
   }
 }
 

docs/Configuring-Pantheon/NetworkID-And-ChainID.md

@@ -24,10 +24,10 @@ same and are specified in the genesis file.
 The network ID and chain ID are automatically defined by Pantheon when connecting to networks specified 
 using the [`--network`](../Reference/Pantheon-CLI-Syntax.md#network) option:
 
-- **MainNet:** chain-id ==1==, network-id ==1==
-- **Rinkeby:** chain-id  ==4==, network-id ==4==
-- **Ropsten:** chain-id ==3==, network-id ==3==
-- **Dev:** chain-id ==2018==, network-id ==2018==
+- **MainNet:** chain-id 1, network-id 1
+- **Rinkeby:** chain-id 4, network-id 4
+- **Ropsten:** chain-id 3, network-id 3
+- **Dev:** chain-id 2018, network-id 2018
 
 When using the [`--network=dev`](../Reference/Pantheon-CLI-Syntax.md#network) or 
 [`--genesis-file`](../Reference/Pantheon-CLI-Syntax.md#genesis-file) options, you can override the 

docs/Configuring-Pantheon/Networking.md

@@ -24,8 +24,8 @@ If connections are not getting through the firewalls, ensure the peer discovery
 ## Peer Discovery Port
 
 The [`--p2p-host`](../Reference/Pantheon-CLI-Syntax.md#p2p-host) and [`--p2p-port`](../Reference/Pantheon-CLI-Syntax.md#p2p-port)
-options specifies the host and port on which P2P peer discovery listens. The default is ==127.0.0.1==
-for host and ==30303== for port.
+options specifies the host and port on which P2P peer discovery listens. The default is `127.0.0.1`
+for host and `30303` for port.
 
 ## Limiting Peers
 

docs/Consensus-Protocols/Comparing-PoA.md

@@ -6,9 +6,6 @@ Pantheon implements the Clique and IBFT 2.0 Proof of Authority consensus protoco
 consensus protocols are used when participants are known to each other and there is a level of trust between them. 
 For example, in a permissioned consortium network. 
 
-!!! note 
-    IBFT 2.0 is under development and will be available in v1.0. 
-
 Proof of Authority consensus protocols allow faster block times and have a much greater throughput of transactions 
 than the Ethash Proof of Work consensus protocol used on the Ethereum MainNet. 
 

docs/Consensus-Protocols/IBFT.md

@@ -6,9 +6,6 @@ description: Pantheon IBFT 2.0 Proof-of-Authority (PoA) consensus protocol imple
 
 # IBFT 2.0
 
-!!! note 
-    IBFT 2.0 is under development and will be available in v1.0. 
-
 Pantheon implements the IBFT 2.0 Proof-of-Authority (PoA) consensus protocol. IBFT 2.0 can be used for private networks. 
 
 In IBFT 2.0 networks, transactions and blocks are validated by approved accounts, known as validators. 

docs/Consensus-Protocols/Overview-Consensus.md

@@ -9,10 +9,7 @@ Pantheon implements a number of consensus protocols:
 
 * [Clique](Clique.md) (Proof of Authority)
 
-* [IBFT 2.0](IBFT.md) (Proof of Authority)
-
-!!! note 
-    IBFT 2.0 is under development and will be available in v1.0. 
+* [IBFT 2.0](IBFT.md) (Proof of Authority) 
 
 The genesis file specifies the consensus protocol for a chain `config`: