Cleanup Post Merge Of Develop

Signed-off-by: Edward Wertz <edward@swirldslabs.com>

hedera-node/hedera-app/src/main/java/com/hedera/node/app/ServicesMain.java

@@ -94,6 +94,7 @@
 import com.swirlds.state.merkle.MerkleStateRoot;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.time.InstantSource;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
@@ -235,7 +236,7 @@ public static void main(final String... args) throws Exception {
         final var selfId = ensureSingleNode(nodesToRun, commandLineArgs.localNodesToStart());
         final var platformConfig = buildPlatformConfig();
         BootstrapUtils.setupConstructableRegistryWithConfiguration(platformConfig);
-        final var networkKeysAndCerts = initNodeSecurity(diskAddressBook, platformConfig);
+        final var networkKeysAndCerts = initNodeSecurity(diskAddressBook, platformConfig, new HashSet<>(nodesToRun));
         final var keysAndCerts = networkKeysAndCerts.get(selfId);
         setupGlobalMetrics(platformConfig);
         metrics = getMetricsProvider().createPlatformMetrics(selfId);

platform-sdk/platform-apps/demos/CryptocurrencyDemo/src/main/java/com/swirlds/demo/crypto/CryptocurrencyDemoMain.java

@@ -31,6 +31,7 @@
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.FAKE_MERKLE_STATE_LIFECYCLES;
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.registerMerkleStateRootClassIds;
 
+import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.swirlds.common.Console;
 import com.swirlds.common.constructable.ClassConstructorPair;
 import com.swirlds.common.constructable.ConstructableRegistry;
@@ -49,6 +50,7 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 /**
  * This demonstrates a cryptocurrency and a stock market. There are 10 stocks, and each member repeatedly generates an
@@ -163,7 +165,14 @@ public void init(final Platform platform, final NodeId id) {
         this.platform = platform;
         this.selfId = id;
         final int winNum = (int) selfId.id();
-        this.console = createConsole(platform, winNum, true, platform.getAddressBook().getNodeIdSet()); // create the window, make it visible
+        this.console = createConsole(
+                platform,
+                winNum,
+                true,
+                platform.getRoster().rosterEntries().stream()
+                        .map(RosterEntry::nodeId)
+                        .map(NodeId::of)
+                        .collect(Collectors.toSet())); // create the window, make it visible
         this.console.addKeyListener(keyListener);
     }
 

platform-sdk/platform-apps/demos/HelloSwirldDemo/src/main/java/com/swirlds/demo/hello/HelloSwirldDemoMain.java

@@ -30,6 +30,7 @@
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.FAKE_MERKLE_STATE_LIFECYCLES;
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.registerMerkleStateRootClassIds;
 
+import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.swirlds.common.Console;
 import com.swirlds.common.constructable.ClassConstructorPair;
 import com.swirlds.common.constructable.ConstructableRegistry;
@@ -48,6 +49,7 @@
 import com.swirlds.platform.system.status.PlatformStatus;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
 
 /**
  * This HelloSwirld creates a single transaction, consisting of the string "Hello Swirld", and then goes
@@ -102,7 +104,13 @@ public void init(final Platform platform, final NodeId id) {
         this.selfId = id;
         final int winNum = (int) selfId.id();
         this.console = createConsole(
-                platform, winNum, true, platform.getAddressBook().getNodeIdSet()); // create the window, make it visible
+                platform,
+                winNum,
+                true,
+                platform.getRoster().rosterEntries().stream()
+                        .map(RosterEntry::nodeId)
+                        .map(NodeId::of)
+                        .collect(Collectors.toSet())); // create the window, make it visible
     }
 
     @Override

platform-sdk/platform-apps/demos/StatsDemo/src/main/java/com/swirlds/demo/stats/StatsDemoMain.java

@@ -32,6 +32,7 @@
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.FAKE_MERKLE_STATE_LIFECYCLES;
 import static com.swirlds.platform.test.fixtures.state.FakeMerkleStateLifecycles.registerMerkleStateRootClassIds;
 
+import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.swirlds.common.Console;
 import com.swirlds.common.constructable.ClassConstructorPair;
 import com.swirlds.common.constructable.ConstructableRegistry;
@@ -57,6 +58,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 /**
  * This demo collects statistics on the running of the network and consensus systems. It writes them to the
@@ -243,7 +245,13 @@ public void init(final Platform platform, final NodeId id) {
         if (!headless) { // create the window, make it visible
             final int winNum = (int) selfId.id();
             console = createConsole(
-                    platform, winNum, true, platform.getAddressBook().getNodeIdSet());
+                    platform,
+                    winNum,
+                    true,
+                    platform.getRoster().rosterEntries().stream()
+                            .map(RosterEntry::nodeId)
+                            .map(NodeId::of)
+                            .collect(Collectors.toSet()));
         }
     }
 

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/Browser.java

@@ -80,6 +80,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -217,7 +218,7 @@ private static void launchUnhandled(@NonNull final CommandLineArgs commandLineAr
                     BootstrapUtils.setupConfigBuilder(configBuilder, getAbsolutePath(DEFAULT_SETTINGS_FILE_NAME)));
             final Configuration configuration = configBuilder.build();
 
-            initNodeSecurity(appDefinition.getConfigAddressBook(), configuration);
+            initNodeSecurity(appDefinition.getConfigAddressBook(), configuration, new HashSet<>(nodesToRun));
             guiEventStorage = new GuiEventStorage(guiConfig, appDefinition.getConfigAddressBook());
 
             guiSource = new StandardGuiSource(appDefinition.getConfigAddressBook(), guiEventStorage);
@@ -253,7 +254,8 @@ private static void launchUnhandled(@NonNull final CommandLineArgs commandLineAr
                     nodeId);
             final var cryptography = CryptographyFactory.create();
             CryptographyHolder.set(cryptography);
-            final KeysAndCerts keysAndCerts = initNodeSecurity(appDefinition.getConfigAddressBook(), configuration)
+            final KeysAndCerts keysAndCerts = initNodeSecurity(
+                            appDefinition.getConfigAddressBook(), configuration, new HashSet<>(nodesToRun))
                     .get(nodeId);
 
             // the AddressBook is not changed after this point, so we calculate the hash now

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/CryptoStatic.java

@@ -353,7 +353,9 @@ private static String getPrivateKeysFileName(final String memberName) {
     @NonNull
     @Deprecated(since = "0.47.0", forRemoval = false)
     static Map<NodeId, KeysAndCerts> loadKeysAndCerts(
-            @NonNull final AddressBook addressBook, @NonNull final Path keysDirPath, @NonNull final char[] password,
+            @NonNull final AddressBook addressBook,
+            @NonNull final Path keysDirPath,
+            @NonNull final char[] password,
             @NonNull Set<NodeId> nodesToStart)
             throws KeyStoreException, KeyLoadingException, UnrecoverableKeyException, NoSuchAlgorithmException,
                     KeyGeneratingException, NoSuchProviderException {

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoader.java

@@ -94,7 +94,7 @@
  *
  * <p>
  * The {@link EnhancedKeyStoreLoader} class is a replacement for the now deprecated
- * {@link CryptoStatic#loadKeysAndCerts(AddressBook, Path, char[])} method. This new implementation adds support for
+ * {@link CryptoStatic#loadKeysAndCerts(AddressBook, Path, char[], Set<NodeId>)} method. This new implementation adds support for
  * loading industry standard PEM formatted PKCS #8 private keys and X.509 certificates. The legacy key stores are still
  * supported, but are no longer the preferred format.
  *
@@ -651,7 +651,7 @@ public PublicStores publicStores(@NonNull final AddressBook validatingBook)
                                 .formatted(nodeId, nodeAlias, KeyCertPurpose.SIGNING));
             }
 
-            if (isLocal(address)) {
+            if (localNodes.contains(nodeId)) {
                 // The agreement certificate is loaded by the local nodes and provided to peers through mTLS handshaking
                 logger.trace(
                         STARTUP.getMarker(),
@@ -1347,7 +1347,7 @@ private long extractPrivateKeysAndCertsFromPfxFiles(
         final AtomicLong errorCount = new AtomicLong(0);
 
         iterateAddressBook(addressBook, (i, nodeId, address, nodeAlias) -> {
-            if (isLocal(address)) {
+            if (localNodes.contains(nodeId)) {
                 // extract private keys for local nodes
                 final Path sPrivateKeyLocation = keyStoreDirectory.resolve("s-private-" + nodeAlias + ".pem");
                 final Path ksLocation = legacyPrivateKeyStore(nodeAlias);
@@ -1442,7 +1442,7 @@ private long validateKeysAndCertsAreLoadableFromPemFiles(
             throws KeyStoreException, KeyLoadingException {
         final AtomicLong errorCount = new AtomicLong(0);
         iterateAddressBook(addressBook, (i, nodeId, address, nodeAlias) -> {
-            if (isLocal(address) && pfxCertificates.containsKey(nodeId)) {
+            if (localNodes.contains(nodeId) && pfxCertificates.containsKey(nodeId)) {
                 // validate private keys for local nodes
                 final Path ksLocation = privateKeyStore(nodeAlias, KeyCertPurpose.SIGNING);
                 final PrivateKey pemPrivateKey = readPrivateKey(nodeId, ksLocation);
@@ -1494,7 +1494,7 @@ private void rollBackSigningKeysAndCertsChanges(
         final AtomicLong cleanupErrorCount = new AtomicLong(0);
         iterateAddressBook(addressBook, (i, nodeId, address, nodeAlias) -> {
             // private key rollback
-            if (isLocal(address) && pfxPrivateKeys.containsKey(address.getNodeId())) {
+            if (localNodes.contains(nodeId) && pfxPrivateKeys.containsKey(address.getNodeId())) {
                 try {
                     Files.deleteIfExists(privateKeyStore(nodeAlias, KeyCertPurpose.SIGNING));
                 } catch (final IOException e) {
@@ -1551,7 +1551,7 @@ private void cleanupByMovingPfxFilesToSubDirectory() throws KeyStoreException, K
             }
         }
         iterateAddressBook(addressBook, (i, nodeId, address, nodeAlias) -> {
-            if (isLocal(address)) {
+            if (localNodes.contains(nodeId)) {
                 // move private key PFX files per local node
                 final File sPrivatePfx = legacyPrivateKeyStore(nodeAlias).toFile();
                 if (sPrivatePfx.exists()

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gui/SwirldsGui.java

@@ -23,16 +23,12 @@
 import com.swirlds.common.platform.NodeId;
 import com.swirlds.platform.gui.internal.SwirldMenu;
 import com.swirlds.platform.roster.RosterUtils;
-import com.swirlds.platform.state.address.AddressBookNetworkUtils;
 import com.swirlds.platform.system.Platform;
-import com.swirlds.platform.system.address.Address;
-import com.swirlds.platform.system.address.AddressBook;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.awt.Color;
 import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.util.Set;
-import javax.swing.JFrame;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/network/connectivity/OutboundConnectionCreator.java

@@ -29,23 +29,16 @@
 import com.swirlds.platform.gossip.sync.SyncOutputStream;
 import com.swirlds.platform.network.Connection;
 import com.swirlds.platform.network.ConnectionTracker;
-import com.swirlds.platform.network.Network;
 import com.swirlds.platform.network.NetworkUtils;
 import com.swirlds.platform.network.SocketConfig;
 import com.swirlds.platform.network.SocketConnection;
 import com.swirlds.platform.network.connection.NotConnectedConnection;
 import com.swirlds.platform.roster.RosterUtils;
-import com.swirlds.platform.system.SoftwareVersion;
-import com.swirlds.platform.system.address.Address;
-import com.swirlds.platform.system.address.AddressBook;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
 import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/util/BootstrapUtils.java

@@ -49,8 +49,6 @@
 import com.swirlds.platform.health.filesystem.OSFileSystemChecker;
 import com.swirlds.platform.network.Network;
 import com.swirlds.platform.state.MerkleRoot;
-import com.swirlds.platform.state.address.AddressBookNetworkUtils;
-import com.swirlds.platform.network.SocketConfig;
 import com.swirlds.platform.state.signed.SignedState;
 import com.swirlds.platform.swirldapp.AppLoaderException;
 import com.swirlds.platform.swirldapp.SwirldAppLoader;

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/crypto/CryptoArgsProvider.java

@@ -106,7 +106,9 @@ public static RosterAndCerts loadAddressBookWithKeys(final int size)
                     NoSuchAlgorithmException, KeyGeneratingException, NoSuchProviderException {
         final AddressBook createdAB = createAddressBook(size);
         final Map<NodeId, KeysAndCerts> loadedC = EnhancedKeyStoreLoader.using(
-                        createdAB, configure(ResourceLoader.getFile("preGeneratedPEMKeysAndCerts/")))
+                        createdAB,
+                        configure(ResourceLoader.getFile("preGeneratedPEMKeysAndCerts/")),
+                        createdAB.getNodeIdSet())
                 .scan()
                 .generate()
                 .verify()

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/crypto/EnhancedKeyStoreLoaderTest.java

@@ -34,6 +34,7 @@
 import java.security.KeyStoreException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -258,7 +259,8 @@ private AddressBook addressBook() {
     void migraitonNegativeCaseTest(final String directoryName) throws IOException {
         final Path keyDirectory = testDataDirectory.resolve(directoryName);
         final AddressBook addressBook = addressBook();
-        final EnhancedKeyStoreLoader loader = EnhancedKeyStoreLoader.using(addressBook, configure(keyDirectory));
+        final EnhancedKeyStoreLoader loader =
+                EnhancedKeyStoreLoader.using(addressBook, configure(keyDirectory), addressBook.getNodeIdSet());
 
         assertThat(keyDirectory).exists().isDirectory().isReadable().isNotEmptyDirectory();