Merge branch 'develop' into 11556-entity-utilization-metrics-cherry-pick

* develop:
  feat: Introduce software update admin (#12489)
  feat: Remove getOtherId (#12465)
  fix: tokenAssociate throws IndexOutOfBoundsException (#12552)
  fix: enable HelloWorldEthereumSuite hapi tests (#11602)
  fix: tokenAssociate throws IndexOutOfBoundsException (#12453)
  fix: treat an out-of-range allowance amount as an invalid op (#12445)
  feat: restrict qualified delegates to appropriate transfer functions only (#12358)
  feat: move the JVM anchor into the wiring model (#12534)
  feat: Automate scheduler construction for the event deduplicator (#12527)
  feat: cleaner wiring for complete state nexus (#12502)
  fix: finalize stake metadata only once per transaction (#12537)
  feat: platform component builder (#12499)
  feat: address book serializes text hostnames (#12515)
  feat: improve bottom half of the wiring diagram (#12511)
  refactor: Migrate some tests to use event test util (#12471)
  test: security v2 model - add test for token associate with callcode (#12168)
  chore: Added extra-checks to prevent unchecked submits (#12436)
  chore: Change owner of DEV configuration (#12523)
  feat: construct schedulers automatically (#12504)
  feat: Cherry-pick: Pass Metrics to created VirtualMaps (#12495)

# Conflicts:
#	hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleContextImpl.java

Author: netopyr

.github/CODEOWNERS

@@ -14,6 +14,7 @@
 
 # Hedera Node Deployments - Configuration & Grafana Dashboards
 /hedera-node/configuration/**                   @rbair23 @dalvizu @poulok @netopyr @Nana-EC @SimiHunjan @steven-sheehy @nathanklick
+/hedera-node/configuration/dev/**               @hashgraph/hedera-base @hashgraph/hedera-services
 /hedera-node/infrastructure/**                  @hashgraph/release-engineering @hashgraph/devops @hashgraph/hedera-base @hashgraph/hedera-services
 
 # Hedera Node Docker Definitions

hedera-node/configuration/dev/application.properties

@@ -9,3 +9,4 @@ staking.fees.nodeRewardPercentage=10
 staking.fees.stakingRewardPercentage=10
 # Needed for Restart and Reconnect HapiTests that run many transactions of each type
 bootstrap.throttleDefsJson.resource=genesis/throttles-dev.json
+ledger.id=0x03

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

@@ -463,7 +463,9 @@ public void onStateInitialized(
             final VirtualMap<UniqueTokenKey, UniqueTokenValue> uniqTokensFromState = state.getChild(UNIQUE_TOKENS);
             if (uniqTokensFromState != null) {
                 // Copy this virtual map, so it doesn't get released before the migration is done
-                MONO_VIRTUAL_MAPS.add(uniqTokensFromState.copy());
+                final var copy = uniqTokensFromState.copy();
+                copy.registerMetrics(metrics);
+                MONO_VIRTUAL_MAPS.add(copy);
                 TOKEN_SERVICE.setNftsFromState(uniqTokensFromState);
             }
 
@@ -472,7 +474,9 @@ public void onStateInitialized(
                     state.getChild(TOKEN_ASSOCIATIONS);
             if (tokenRelsFromState != null) {
                 // Copy this virtual map, so it doesn't get released before the migration is done
-                MONO_VIRTUAL_MAPS.add(tokenRelsFromState.copy());
+                final var copy = tokenRelsFromState.copy();
+                copy.registerMetrics(metrics);
+                MONO_VIRTUAL_MAPS.add(copy);
                 TOKEN_SERVICE.setTokenRelsFromState(tokenRelsFromState);
             }
 
@@ -486,7 +490,9 @@ public void onStateInitialized(
             final VirtualMap<VirtualBlobKey, VirtualBlobValue> filesFromState = state.getChild(STORAGE);
             if (filesFromState != null) {
                 // Copy this virtual map, so it doesn't get released before the migration is done
-                MONO_VIRTUAL_MAPS.add(filesFromState.copy());
+                final var copy = filesFromState.copy();
+                copy.registerMetrics(metrics);
+                MONO_VIRTUAL_MAPS.add(copy);
 
                 // Note: some files have no metadata, e.g. contract bytecode files
                 FILE_SERVICE.setFs(() -> VirtualMapLike.from(filesFromState));
@@ -499,7 +505,9 @@ public void onStateInitialized(
             final VirtualMap<EntityNumVirtualKey, OnDiskAccount> acctsFromState = state.getChild(ACCOUNTS);
             if (acctsFromState != null) {
                 // Copy this virtual map, so it doesn't get released before the migration is done
-                MONO_VIRTUAL_MAPS.add(acctsFromState.copy());
+                final var copy = acctsFromState.copy();
+                copy.registerMetrics(metrics);
+                MONO_VIRTUAL_MAPS.add(copy);
                 TOKEN_SERVICE.setAcctsFromState(acctsFromState);
             }
 
@@ -536,7 +544,9 @@ public void onStateInitialized(
             final VirtualMap<ContractKey, IterableContractValue> contractFromStorage = state.getChild(CONTRACT_STORAGE);
             if (contractFromStorage != null) {
                 // Copy this virtual map, so it doesn't get released before the migration is done
-                MONO_VIRTUAL_MAPS.add(contractFromStorage.copy());
+                final var copy = contractFromStorage.copy();
+                copy.registerMetrics(metrics);
+                MONO_VIRTUAL_MAPS.add(copy);
                 CONTRACT_SERVICE.setStorageFromState(VirtualMapLike.from(contractFromStorage));
             }
 
@@ -616,7 +626,7 @@ public void onStateInitialized(
         // here. This is intentional so as to avoid forgetting to handle a new trigger.
         try {
             switch (trigger) {
-                case GENESIS -> genesis(state, platformState);
+                case GENESIS -> genesis(state, platformState, metrics);
                 case RECONNECT -> reconnect(state, deserializedVersion, platformState, metrics);
                 case RESTART, EVENT_STREAM_RECOVERY -> restart(
                         state, deserializedVersion, trigger, platformState, metrics);
@@ -653,7 +663,8 @@ public void onStateInitialized(
     private void onMigrate(
             @NonNull final MerkleHederaState state,
             @Nullable final HederaSoftwareVersion deserializedVersion,
-            @NonNull final InitTrigger trigger) {
+            @NonNull final InitTrigger trigger,
+            @NonNull final Metrics metrics) {
         final var currentVersion = version.getServicesVersion();
         final var previousVersion = deserializedVersion == null ? null : deserializedVersion.getServicesVersion();
         logger.info(
@@ -669,7 +680,8 @@ private void onMigrate(
 
         final var migrator = new OrderedServiceMigrator(servicesRegistry);
         logger.info("Migration versions are {} to {}", previousVersion, currentVersion);
-        migrator.doMigrations(state, currentVersion, previousVersion, configProvider.getConfiguration(), networkInfo);
+        migrator.doMigrations(
+                state, currentVersion, previousVersion, configProvider.getConfiguration(), networkInfo, metrics);
 
         // Now that migrations are complete, clean up the leftover virtual maps
         MONO_VIRTUAL_MAPS.forEach(vm -> {
@@ -976,10 +988,13 @@ public void shutdownGrpcServer() {
     /**
      * Implements the code flow for initializing the state of a new Hedera node with NO SAVED STATE.
      */
-    private void genesis(@NonNull final MerkleHederaState state, @NonNull final PlatformState platformState) {
+    private void genesis(
+            @NonNull final MerkleHederaState state,
+            @NonNull final PlatformState platformState,
+            @NonNull final Metrics metrics) {
         logger.debug("Genesis Initialization");
         // Create all the nodes in the merkle tree for all the services
-        onMigrate(state, null, GENESIS);
+        onMigrate(state, null, GENESIS, metrics);
         // Now that we have the state created, we are ready to create the dependency graph with Dagger
         initializeDagger(state, GENESIS, platformState);
         // And now that the entire dependency graph has been initialized, and we have config, and all migration has
@@ -1051,7 +1066,7 @@ private void initializeForTrigger(
         // Create all the nodes in the merkle tree for all the services
         // TODO: Actually, we should reinitialize the config on each step along the migration path, so we should pass
         //       the config provider to the migration code and let it get the right version of config as it goes.
-        onMigrate(state, deserializedVersion, trigger);
+        onMigrate(state, deserializedVersion, trigger, metrics);
         if (trigger == EVENT_STREAM_RECOVERY) {
             // (FUTURE) Dump post-migration mod-service state
         }

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

@@ -28,6 +28,7 @@
 import com.hedera.node.app.state.merkle.MerkleHederaState;
 import com.hedera.node.app.state.merkle.MerkleSchemaRegistry;
 import com.hedera.node.config.VersionedConfiguration;
+import com.swirlds.metrics.api.Metrics;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Comparator;
@@ -62,11 +63,13 @@ public void doMigrations(
             @NonNull final SemanticVersion currentVersion,
             @Nullable final SemanticVersion previousVersion,
             @NonNull final VersionedConfiguration versionedConfiguration,
-            @NonNull final NetworkInfo networkInfo) {
+            @NonNull final NetworkInfo networkInfo,
+            @NonNull final Metrics metrics) {
         requireNonNull(state);
         requireNonNull(currentVersion);
         requireNonNull(versionedConfiguration);
         requireNonNull(networkInfo);
+        requireNonNull(metrics);
 
         logger.info("Migrating Entity ID Service as pre-requisite for other services");
         final var entityIdRegistration = servicesRegistry.registrations().stream()
@@ -80,6 +83,7 @@ public void doMigrations(
                 currentVersion,
                 versionedConfiguration,
                 networkInfo,
+                metrics,
                 // We call with null here because we're migrating the entity ID service itself
                 null);
 
@@ -116,6 +120,7 @@ public void doMigrations(
                             currentVersion,
                             versionedConfiguration,
                             networkInfo,
+                            metrics,
                             // If we have reached this point in the code, entityIdStore should not be null because the
                             // EntityIdService should have been migrated already. We enforce with requireNonNull in case
                             // there are scenarios we haven't considered.

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

@@ -18,8 +18,9 @@
 
 import static com.swirlds.common.io.utility.FileUtils.getAbsolutePath;
 import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
-import static com.swirlds.platform.PlatformBuilder.DEFAULT_SETTINGS_FILE_NAME;
-import static com.swirlds.platform.PlatformBuilder.buildPlatformContext;
+import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_CONFIG_FILE_NAME;
+import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_SETTINGS_FILE_NAME;
+import static com.swirlds.platform.builder.PlatformBuilder.buildPlatformContext;
 import static com.swirlds.platform.system.SystemExitCode.CONFIGURATION_ERROR;
 import static com.swirlds.platform.system.SystemExitCode.NODE_ADDRESS_MISMATCH;
 import static com.swirlds.platform.system.SystemExitUtils.exitSystem;
@@ -37,7 +38,7 @@
 import com.swirlds.config.extensions.sources.SystemEnvironmentConfigSource;
 import com.swirlds.config.extensions.sources.SystemPropertiesConfigSource;
 import com.swirlds.platform.CommandLineArgs;
-import com.swirlds.platform.PlatformBuilder;
+import com.swirlds.platform.builder.PlatformBuilder;
 import com.swirlds.platform.config.legacy.ConfigurationException;
 import com.swirlds.platform.config.legacy.LegacyConfigProperties;
 import com.swirlds.platform.config.legacy.LegacyConfigPropertiesLoader;
@@ -128,7 +129,7 @@ public static void main(final String... args) throws Exception {
 
         // Determine which node to run locally
         // Load config.txt address book file and parse address book
-        final AddressBook addressBook = loadAddressBook(PlatformBuilder.DEFAULT_CONFIG_FILE_NAME);
+        final AddressBook addressBook = loadAddressBook(DEFAULT_CONFIG_FILE_NAME);
         // parse command line arguments
         final CommandLineArgs commandLineArgs = CommandLineArgs.parse(args);
 
@@ -160,7 +161,7 @@ public static void main(final String... args) throws Exception {
                 buildPlatformContext(config, getAbsolutePath(DEFAULT_SETTINGS_FILE_NAME), selfId);
 
         final PlatformBuilder builder =
-                new PlatformBuilder(Hedera.APP_NAME, Hedera.SWIRLD_NAME, version, hedera::newState, selfId);
+                PlatformBuilder.create(Hedera.APP_NAME, Hedera.SWIRLD_NAME, version, hedera::newState, selfId);
 
         builder.withPreviousSoftwareVersionClassId(0x6f2b1bc2df8cbd0bL /* SerializableSemVers.CLASS_ID */);
         builder.withPlatformContext(platformContext);

hedera-node/hedera-app/src/main/java/com/hedera/node/app/authorization/PrivilegesVerifier.java

@@ -145,6 +145,10 @@ private boolean isSystemAdmin(@NonNull final AccountID accountID) {
         return accountID.accountNumOrThrow() == accountsConfig.systemAdmin();
     }
 
+    private boolean hasSoftwareUpdatePrivilege(@NonNull final AccountID accountID) {
+        return accountID.accountNumOrThrow() == accountsConfig.softwareUpdateAdmin() || isSuperUser(accountID);
+    }
+
     private boolean hasFreezePrivilege(@NonNull final AccountID accountID) {
         return accountID.accountNumOrThrow() == accountsConfig.freezeAdmin() || isSuperUser(accountID);
     }
@@ -215,7 +219,7 @@ private SystemPrivilege checkFileChange(@NonNull final AccountID accountID, fina
             return hasExchangeRatePrivilige(accountID) ? AUTHORIZED : UNAUTHORIZED;
         } else if (filesConfig.softwareUpdateRange().left() <= entityNum
                 && entityNum <= filesConfig.softwareUpdateRange().right()) {
-            return hasFreezePrivilege(accountID) ? AUTHORIZED : UNAUTHORIZED;
+            return hasSoftwareUpdatePrivilege(accountID) ? AUTHORIZED : UNAUTHORIZED;
         } else if (entityNum == filesConfig.throttleDefinitions()) {
             return hasAddressBookPrivilege(accountID) || hasExchangeRatePrivilige(accountID)
                     ? AUTHORIZED

hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/merkle/MerkleHederaState.java

@@ -51,6 +51,7 @@
 import com.swirlds.common.merkle.impl.PartialNaryMerkleInternal;
 import com.swirlds.common.utility.Labeled;
 import com.swirlds.merkle.map.MerkleMap;
+import com.swirlds.metrics.api.Metrics;
 import com.swirlds.platform.state.PlatformState;
 import com.swirlds.platform.system.InitTrigger;
 import com.swirlds.platform.system.Platform;
@@ -64,7 +65,11 @@
 import com.swirlds.virtualmap.VirtualMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
@@ -132,6 +137,8 @@ public class MerkleHederaState extends PartialNaryMerkleInternal implements Merk
         return services;
     }
 
+    private Metrics metrics;
+
     /**
      * Maintains information about each service, and each state of each service, known by this
      * instance. The key is the "service-name.state-key".
@@ -185,6 +192,8 @@ public void init(
             final PlatformState platformState,
             final InitTrigger trigger,
             final SoftwareVersion deserializedVersion) {
+        metrics = platform.getContext().getMetrics();
+
         // If we are initialized for event stream recovery, we have to register an
         // extra listener to make sure we call all the required Hedera lifecycles
         if (trigger == EVENT_STREAM_RECOVERY) {
@@ -677,6 +686,9 @@ public void copyAndReleaseVirtualMap(@NonNull final String stateKey) {
             final var md = stateMetadata.get(stateKey);
             final VirtualMap<?, ?> virtualMap = (VirtualMap<?, ?>) findNode(md);
             final var mutableCopy = virtualMap.copy();
+            if (metrics != null) {
+                mutableCopy.registerMetrics(metrics);
+            }
             setChild(findNodeIndex(serviceName, stateKey), mutableCopy);
             kvInstances.put(stateKey, createReadableKVState(md, mutableCopy));
         }

hedera-node/hedera-app/src/main/java/com/hedera/node/app/state/merkle/MerkleSchemaRegistry.java

@@ -51,6 +51,7 @@
 import com.swirlds.merkle.map.MerkleMap;
 import com.swirlds.merkledb.MerkleDbDataSourceBuilder;
 import com.swirlds.merkledb.MerkleDbTableConfig;
+import com.swirlds.metrics.api.Metrics;
 import com.swirlds.virtualmap.VirtualMap;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -161,11 +162,13 @@ public void migrate(
             @NonNull final SemanticVersion currentVersion,
             @NonNull final Configuration config,
             @NonNull final NetworkInfo networkInfo,
+            @NonNull final Metrics metrics,
             @Nullable final WritableEntityIdStore entityIdStore) {
         requireNonNull(hederaState);
         requireNonNull(currentVersion);
         requireNonNull(config);
         requireNonNull(networkInfo);
+        requireNonNull(metrics);
 
         // Figure out which schemas need to be applied based on the previous and current versions, and then for each
         // of those schemas, create the new states and remove the old states and migrate the data.
@@ -230,7 +233,9 @@ public void migrate(
                                         .maxNumberOfKeys(def.maxKeysHint());
                                 final var label = StateUtils.computeLabel(serviceName, stateKey);
                                 final var dsBuilder = new MerkleDbDataSourceBuilder<>(tableConfig);
-                                return new VirtualMap<>(label, dsBuilder);
+                                final var virtualMap = new VirtualMap<>(label, dsBuilder);
+                                virtualMap.registerMetrics(metrics);
+                                return virtualMap;
                             });
                         }
                     });