fix: app and services to stop querying the platform for the roster

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

@@ -56,6 +56,7 @@
 import com.hedera.hapi.node.base.SemanticVersion;
 import com.hedera.hapi.node.state.blockrecords.BlockInfo;
 import com.hedera.hapi.node.state.blockstream.BlockStreamInfo;
+import com.hedera.hapi.node.state.roster.Roster;
 import com.hedera.hapi.node.transaction.ThrottleDefinitions;
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.hapi.platform.state.PlatformState;
@@ -113,6 +114,7 @@
 import com.hedera.node.config.data.HederaConfig;
 import com.hedera.node.config.data.LedgerConfig;
 import com.hedera.node.config.data.NetworkAdminConfig;
+import com.hedera.node.config.data.TssConfig;
 import com.hedera.node.config.data.VersionConfig;
 import com.hedera.node.config.types.StreamMode;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
@@ -133,6 +135,7 @@
 import com.swirlds.platform.listeners.ReconnectCompleteListener;
 import com.swirlds.platform.listeners.ReconnectCompleteNotification;
 import com.swirlds.platform.listeners.StateWriteToDiskCompleteListener;
+import com.swirlds.platform.roster.RosterHistory;
 import com.swirlds.platform.roster.RosterUtils;
 import com.swirlds.platform.state.MerkleRoot;
 import com.swirlds.platform.state.PlatformMerkleStateRoot;
@@ -351,6 +354,8 @@
     @Nullable
     private StartupNetworks startupNetworks;
 
+    private RosterHistory rosterHistory;
+
     @FunctionalInterface
     public interface TssBaseServiceFactory {
         @NonNull
@@ -600,7 +605,7 @@
                     state,
                     metrics,
                     trigger,
-                    RosterUtils.buildAddressBook(platform.getRoster()),
+                    RosterUtils.buildAddressBook(this.rosterHistory.getCurrentRoster()),
                     platform.getContext().getConfiguration());
         }
         // With the States API grounded in the working state, we can create the object graph from it
@@ -619,7 +624,7 @@
      * @param state                 current state
      * @param deserializedVersion   version deserialized
      * @param trigger               trigger that is calling migration
-     * @param genesisAddressBook    the genesis address book, if applicable
+     * @param genesisAddressBook the genesis address book, if applicable
      * @param platformConfiguration platform configuration
      */
     private void migrateSchemas(
@@ -911,6 +916,15 @@
         initialStateHashFuture = completedFuture(stateHash.getBytes());
     }
 
+    /**
+     * Called to set the roster history used when building the platform.
+     *
+     * @param rosterHistory the roster history used when building the platform
+     */
+    public void setRosterHistory(@NonNull final RosterHistory rosterHistory) {
+        this.rosterHistory = rosterHistory;
+    }
+
     /*==================================================================================================================
     *
     * Exposed for use by embedded Hedera
@@ -1001,8 +1015,14 @@
                 .round();
         final var initialStateHash = new InitialStateHash(initialStateHashFuture, roundNum);
 
-        final var activeRoster = tssBaseService.chooseRosterForNetwork(
-                state, trigger, serviceMigrator, version, configProvider.getConfiguration(), platform.getRoster());
+        final Roster activeRoster;
+        if (!configProvider.getConfiguration().getConfigData(TssConfig.class).keyCandidateRoster()) {
+            final var platformState =
+                    new ReadablePlatformStateStore(state.getReadableStates(PlatformStateService.NAME));
+            activeRoster = buildRoster(platformState.getAddressBook());
+        } else {
+            activeRoster = tssBaseService.chooseRosterForNetwork(state, trigger, serviceMigrator, version);
+        }
         final var networkInfo =
                 new StateNetworkInfo(state, activeRoster, platform.getSelfId().id(), configProvider);
         // Fully qualified so as to not confuse javadoc

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

@@ -313,6 +313,7 @@
                 .withConfiguration(configuration)
                 .withKeysAndCerts(keysAndCerts);
 
+        hedera.setRosterHistory(rosterHistory);
         hedera.setInitialStateHash(stateHash);
         // IMPORTANT: A surface-level reading of this method will undersell the centrality
         // of the Hedera instance. It is actually omnipresent throughout both the startup

hedera-node/hedera-app/src/main/java/com/hedera/node/app/platform/PlatformModule.java

@@ -30,7 +30,6 @@
 import java.nio.charset.Charset;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
-import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 import javax.inject.Singleton;
 
@@ -55,12 +54,6 @@ static Supplier<Charset> provideNativeCharset() {
         return Charset::defaultCharset;
     }
 
-    @Provides
-    @Singleton
-    static IntSupplier provideFrontendThrottleSplit(@NonNull final Platform platform) {
-        return () -> platform.getRoster().rosterEntries().size();
-    }
-
     @Binds
     @Singleton
     ReconnectCompleteListener bindReconnectListener(ReconnectListener reconnectListener);

hedera-node/hedera-app/src/main/java/com/hedera/node/app/throttle/ThrottleServiceModule.java

@@ -29,6 +29,7 @@
 import com.hedera.node.config.ConfigProvider;
 import com.hedera.node.config.data.FeesConfig;
 import com.swirlds.metrics.api.Metrics;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
@@ -60,10 +61,12 @@ static ThrottleAccumulator provideBackendThrottleAccumulator(
     @Singleton
     @IngestThrottle
     static ThrottleAccumulator provideIngestThrottleAccumulator(
-            @NonNull final IntSupplier frontendThrottleSplit,
+            @NonNull final NetworkInfo networkInfo,
             @NonNull final ConfigProvider configProvider,
             @NonNull final Metrics metrics) {
         final var throttleMetrics = new ThrottleMetrics(metrics, FRONTEND_THROTTLE);
+        final IntSupplier frontendThrottleSplit =
+                () -> networkInfo.roster().rosterEntries().size();
         return new ThrottleAccumulator(
                 frontendThrottleSplit,
                 configProvider::getConfiguration,

hedera-node/hedera-app/src/main/java/com/hedera/node/app/tss/TssBaseService.java

@@ -26,7 +26,6 @@
 import com.hedera.node.app.tss.stores.ReadableTssStoreImpl;
 import com.hedera.node.app.version.ServicesSoftwareVersion;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.config.api.Configuration;
 import com.swirlds.platform.system.InitTrigger;
 import com.swirlds.state.State;
 import com.swirlds.state.lifecycle.Service;
@@ -138,16 +137,13 @@ void bootstrapLedgerId(
      * @param trigger         the initialization trigger
      * @param serviceMigrator the service migrator
      * @param version         the services software version
-     * @param configuration   the configuration
      * @return the active roster
      */
     Roster chooseRosterForNetwork(
             @NonNull State state,
             @NonNull InitTrigger trigger,
             @NonNull ServiceMigrator serviceMigrator,
-            @NonNull ServicesSoftwareVersion version,
-            @NonNull Configuration configuration,
-            @NonNull Roster overrideRoster);
+            @NonNull ServicesSoftwareVersion version);
 
     /**
      * Regenerates the key material for the active roster. This happens each time the active roster is updated.

hedera-node/hedera-app/src/main/java/com/hedera/node/app/tss/TssBaseServiceImpl.java

@@ -49,7 +49,6 @@
 import com.hedera.node.config.data.TssConfig;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.utility.CommonUtils;
-import com.swirlds.config.api.Configuration;
 import com.swirlds.metrics.api.Metrics;
 import com.swirlds.platform.roster.RosterUtils;
 import com.swirlds.platform.state.service.ReadableRosterStore;
@@ -270,12 +269,8 @@ public Roster chooseRosterForNetwork(
             @NonNull State state,
             @NonNull InitTrigger trigger,
             @NonNull ServiceMigrator serviceMigrator,
-            @NonNull ServicesSoftwareVersion version,
-            @NonNull final Configuration configuration,
-            @NonNull final Roster overrideRoster) {
-        if (!configuration.getConfigData(TssConfig.class).keyCandidateRoster()) {
-            return overrideRoster;
-        }
+            @NonNull ServicesSoftwareVersion version) {
+
         final var activeRoster = retrieveActiveOrGenesisRoster(state);
         if (trigger != GENESIS) {
             final var creatorVersion = requireNonNull(serviceMigrator.creationVersionOf(state));

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutors.java

@@ -81,8 +81,8 @@ public TransactionExecutor newExecutor(
         final var tracerBinding =
                 customTracerBinding != null ? customTracerBinding : DefaultTracerBinding.DEFAULT_TRACER_BINDING;
         final var executor = newExecutorComponent(state, properties, tracerBinding);
-        executor.initializer().accept(state);
         executor.stateNetworkInfo().initFrom(state);
+        executor.initializer().accept(state);
         final var exchangeRateManager = executor.exchangeRateManager();
         return (transactionBody, consensusNow, operationTracers) -> {
             final var dispatch = executor.standaloneDispatchFactory().newDispatch(state, transactionBody, consensusNow);

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/impl/StandaloneNetworkInfo.java

@@ -24,6 +24,7 @@
 import com.hedera.hapi.node.base.AccountID;
 import com.hedera.hapi.node.base.NodeAddressBook;
 import com.hedera.hapi.node.state.roster.Roster;
+import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.hedera.node.app.info.NodeInfoImpl;
 import com.hedera.node.config.ConfigProvider;
 import com.hedera.node.config.data.FilesConfig;
@@ -35,6 +36,7 @@
 import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import java.util.Comparator;
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -135,7 +137,17 @@ public void updateFrom(final State state) {
 
     @Override
     public Roster roster() {
-        throw new UnsupportedOperationException("Not implemented");
+        return Roster.newBuilder()
+                .rosterEntries(nodeInfosOrThrow().stream()
+                        .map(node -> RosterEntry.newBuilder()
+                                .nodeId(node.nodeId())
+                                .weight(node.stake())
+                                .gossipCaCertificate(node.sigCertBytes())
+                                .gossipEndpoint(node.gossipEndpoints())
+                                .build())
+                        .sorted(Comparator.comparing(RosterEntry::nodeId))
+                        .toList())
+                .build();
     }
 
     private @NonNull List<NodeInfo> nodeInfosOrThrow() {

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/embedded/fakes/FakeTssBaseService.java

@@ -34,7 +34,6 @@
 import com.hedera.services.bdd.junit.HapiTest;
 import com.swirlds.common.metrics.noop.NoOpMetrics;
 import com.swirlds.common.utility.CommonUtils;
-import com.swirlds.config.api.Configuration;
 import com.swirlds.platform.system.InitTrigger;
 import com.swirlds.state.State;
 import com.swirlds.state.lifecycle.SchemaRegistry;
@@ -241,10 +240,8 @@ public Roster chooseRosterForNetwork(
             @NonNull State state,
             @NonNull InitTrigger trigger,
             @NonNull ServiceMigrator serviceMigrator,
-            @NonNull ServicesSoftwareVersion version,
-            @NonNull final Configuration configuration,
-            @NonNull final Roster overrideRoster) {
-        return delegate.chooseRosterForNetwork(state, trigger, serviceMigrator, version, configuration, overrideRoster);
+            @NonNull ServicesSoftwareVersion version) {
+        return delegate.chooseRosterForNetwork(state, trigger, serviceMigrator, version);
     }
 
     @Override