remove sync status permissioning provider (#8598)

* remove sync status permissioning provider since it was only used with onchain permissioning

Signed-off-by: Sally MacFarlane <[email protected]>

---------

Signed-off-by: Sally MacFarlane <[email protected]>

Author: macfarla

besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java

@@ -668,7 +668,7 @@ public Runner build() {
 
     final PeerPermissions peerPermissions =
         nodePermissioningController
-            .map(nodePC -> new PeerPermissionsAdapter(nodePC, bootnodes, context.getBlockchain()))
+            .map(nodePC -> new PeerPermissionsAdapter(nodePC, context.getBlockchain()))
             .map(nodePerms -> PeerPermissions.combine(nodePerms, defaultPeerPermissions))
             .orElse(defaultPeerPermissions);
 

ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java

@@ -17,7 +17,6 @@
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
@@ -26,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
@@ -45,8 +43,6 @@ public NodePermissioningController create(
 
     ArrayList<NodeConnectionPermissioningProvider> providers = Lists.newArrayList(pluginProviders);
 
-    final Optional<SyncStatusNodePermissioningProvider> syncStatusProviderOptional;
-
     if (permissioningConfiguration.getLocalConfig().isPresent()) {
       LocalPermissioningConfiguration localPermissioningConfiguration =
           permissioningConfiguration.getLocalConfig().get();
@@ -61,10 +57,8 @@ public NodePermissioningController create(
       }
     }
 
-    syncStatusProviderOptional = Optional.empty();
-
     final NodePermissioningController nodePermissioningController =
-        new NodePermissioningController(syncStatusProviderOptional, providers);
+        new NodePermissioningController(providers);
 
     return nodePermissioningController;
   }

ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java

@@ -15,7 +15,6 @@
 package org.hyperledger.besu.ethereum.permissioning.node;
 
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
 import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 import org.hyperledger.besu.util.Subscribers;
@@ -30,33 +29,19 @@ public class NodePermissioningController {
 
   private static final Logger LOG = LoggerFactory.getLogger(NodePermissioningController.class);
 
-  private final Optional<SyncStatusNodePermissioningProvider> syncStatusNodePermissioningProvider;
   private Optional<ContextualNodePermissioningProvider> insufficientPeersPermissioningProvider =
       Optional.empty();
   private final List<NodeConnectionPermissioningProvider> providers;
   private final Subscribers<Runnable> permissioningUpdateSubscribers = Subscribers.create();
 
-  public NodePermissioningController(
-      final Optional<SyncStatusNodePermissioningProvider> syncStatusNodePermissioningProvider,
-      final List<NodeConnectionPermissioningProvider> providers) {
+  public NodePermissioningController(final List<NodeConnectionPermissioningProvider> providers) {
     this.providers = providers;
-    this.syncStatusNodePermissioningProvider = syncStatusNodePermissioningProvider;
   }
 
   public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
 
     LOG.trace("Node permissioning: Checking {} -> {}", sourceEnode, destinationEnode);
 
-    if (syncStatusNodePermissioningProvider
-        .map(p -> !p.hasReachedSync() && p.isConnectionPermitted(sourceEnode, destinationEnode))
-        .orElse(false)) {
-
-      LOG.trace(
-          "Node permissioning - Sync Status: Permitted {} -> {}", sourceEnode, destinationEnode);
-
-      return true;
-    }
-
     final Optional<Boolean> insufficientPeerPermission =
         insufficientPeersPermissioningProvider.flatMap(
             p -> p.isPermitted(sourceEnode, destinationEnode));
@@ -72,27 +57,15 @@ public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinatio
 
       return permitted;
     }
-
-    if (syncStatusNodePermissioningProvider.isPresent()
-        && !syncStatusNodePermissioningProvider
-            .get()
-            .isConnectionPermitted(sourceEnode, destinationEnode)) {
-
-      LOG.trace(
-          "Node permissioning - Sync Status: Rejected {} -> {}", sourceEnode, destinationEnode);
-
-      return false;
-    } else {
-      for (final NodeConnectionPermissioningProvider provider : providers) {
-        if (!provider.isConnectionPermitted(sourceEnode, destinationEnode)) {
-          LOG.trace(
-              "Node permissioning - {}: Rejected {} -> {}",
-              provider.getClass().getSimpleName(),
-              sourceEnode,
-              destinationEnode);
-
-          return false;
-        }
+    for (final NodeConnectionPermissioningProvider provider : providers) {
+      if (!provider.isConnectionPermitted(sourceEnode, destinationEnode)) {
+        LOG.trace(
+            "Node permissioning - {}: Rejected {} -> {}",
+            provider.getClass().getSimpleName(),
+            sourceEnode,
+            destinationEnode);
+
+        return false;
       }
     }
 
@@ -109,10 +82,6 @@ public void setInsufficientPeersPermissioningProvider(
         Optional.of(insufficientPeersPermissioningProvider);
   }
 
-  public Optional<SyncStatusNodePermissioningProvider> getSyncStatusNodePermissioningProvider() {
-    return syncStatusNodePermissioningProvider;
-  }
-
   public List<NodeConnectionPermissioningProvider> getProviders() {
     return providers;
   }

ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java

@@ -19,10 +19,7 @@
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
-import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
-import org.hyperledger.besu.plugin.data.EnodeURL;
 
-import java.util.List;
 import java.util.Optional;
 
 import org.slf4j.Logger;
@@ -32,21 +29,16 @@ public class PeerPermissionsAdapter extends PeerPermissions {
   private static final Logger LOG = LoggerFactory.getLogger(PeerPermissionsAdapter.class);
 
   private final NodePermissioningController nodePermissioningController;
-  private final List<EnodeURL> bootnodes;
   private final Blockchain blockchain;
   private final long blockchainListenId;
   private final long nodePermissioningListenId;
 
   public PeerPermissionsAdapter(
-      final NodePermissioningController nodePermissioningController,
-      final List<EnodeURL> bootnodes,
-      final Blockchain blockchain) {
+      final NodePermissioningController nodePermissioningController, final Blockchain blockchain) {
     checkNotNull(nodePermissioningController);
-    checkNotNull(bootnodes);
     checkNotNull(blockchain);
 
     this.nodePermissioningController = nodePermissioningController;
-    this.bootnodes = bootnodes;
     this.blockchain = blockchain;
 
     // TODO: These events should be more targeted
@@ -87,30 +79,11 @@ public boolean isPermitted(final Peer localNode, final Peer remotePeer, final Ac
   }
 
   private boolean allowOutboundBonding(final Peer localNode, final Peer remotePeer) {
-    final boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
-    if (!nodePermissioningController.getSyncStatusNodePermissioningProvider().isPresent()) {
-      return outboundMessagingAllowed;
-    }
-
-    // We're using smart-contract based permissioning
-    // If we're out of sync, only allow bonding to our bootnodes
-    final SyncStatusNodePermissioningProvider syncStatus =
-        nodePermissioningController.getSyncStatusNodePermissioningProvider().get();
-    return outboundMessagingAllowed
-        && (syncStatus.hasReachedSync() || bootnodes.contains(remotePeer.getEnodeURL()));
+    return outboundIsPermitted(localNode, remotePeer);
   }
 
   private boolean allowOutboundNeighborsRequests(final Peer localNode, final Peer remotePeer) {
-    final boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
-    if (!nodePermissioningController.getSyncStatusNodePermissioningProvider().isPresent()) {
-      return outboundMessagingAllowed;
-    }
-
-    // We're using smart-contract based permissioning
-    // Only allow neighbors requests if we're in sync
-    final SyncStatusNodePermissioningProvider syncStatus =
-        nodePermissioningController.getSyncStatusNodePermissioningProvider().get();
-    return outboundMessagingAllowed && syncStatus.hasReachedSync();
+    return outboundIsPermitted(localNode, remotePeer);
   }
 
   private boolean outboundIsPermitted(final Peer localNode, final Peer remotePeer) {

ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java

@@ -80,7 +80,6 @@ public void testCreateWithNoPermissioningEnabled() {
 
     List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(0);
-    assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
 
   @Test
@@ -107,7 +106,6 @@ public void testCreateWithLocalNodePermissioningEnabledOnly() {
 
     NodeConnectionPermissioningProvider p1 = providers.get(0);
     assertThat(p1).isInstanceOf(NodeLocalConfigPermissioningController.class);
-    assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
 
   @Test
@@ -135,6 +133,5 @@ public void testCreateWithLocalNodePermissioningEnabledAndBootnode() {
 
     NodeConnectionPermissioningProvider p1 = providers.get(0);
     assertThat(p1).isInstanceOf(NodeLocalConfigPermissioningController.class);
-    assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
 }