refactor: 21898 Remove version management from SwirldStateManager (#21905)

Signed-off-by: Ivan Malygin <[email protected]>

Author: imalygin

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

@@ -211,6 +211,7 @@ public SwirldsPlatform(@NonNull final PlatformComponentBuilder builder) {
         // This object makes a copy of the state. After this point, initialState becomes immutable.
         final SwirldStateManager swirldStateManager = blocks.swirldStateManager();
         swirldStateManager.setState(initialState.getState(), true);
+        platformStateFacade.setCreationSoftwareVersionTo(swirldStateManager.getConsensusState(), blocks.appVersion());
 
         final EventWindowManager eventWindowManager = new DefaultEventWindowManager();
 

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java

@@ -433,8 +433,7 @@ public PlatformComponentBuilder buildComponentBuilder() {
                 new ApplicationCallbacks(preconsensusEventConsumer, snapshotOverrideConsumer, staleEventConsumer);
 
         final AtomicReference<StatusActionSubmitter> statusActionSubmitterAtomicReference = new AtomicReference<>();
-        final SwirldStateManager swirldStateManager =
-                new SwirldStateManager(platformContext, currentRoster, softwareVersion, platformStateFacade);
+        final SwirldStateManager swirldStateManager = new SwirldStateManager(platformContext, currentRoster);
 
         if (model == null) {
             final WiringConfig wiringConfig = platformContext.getConfiguration().getConfigData(WiringConfig.class);

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/SwirldStateManager.java

@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.swirlds.platform.state;
 
-import static com.swirlds.platform.state.SwirldStateManagerUtils.fastCopy;
+import static com.swirlds.base.units.UnitConstants.NANOSECONDS_TO_MICROSECONDS;
 import static java.util.Objects.requireNonNull;
 
-import com.hedera.hapi.node.base.SemanticVersion;
 import com.hedera.hapi.node.state.roster.Roster;
 import com.swirlds.common.context.PlatformContext;
-import com.swirlds.platform.state.service.PlatformStateFacade;
 import com.swirlds.state.MerkleNodeState;
 import com.swirlds.state.State;
 import com.swirlds.state.merkle.StateMetrics;
@@ -35,31 +33,16 @@ public class SwirldStateManager {
      */
     private final AtomicReference<MerkleNodeState> latestImmutableState = new AtomicReference<>();
 
-    /**
-     * The current software version.
-     */
-    private final SemanticVersion softwareVersion;
-
-    private final PlatformStateFacade platformStateFacade;
-
     /**
      * Constructor.
      *
      * @param platformContext       the platform context
      * @param roster                the current roster
-     * @param softwareVersion       the current software version
      */
-    public SwirldStateManager(
-            @NonNull final PlatformContext platformContext,
-            @NonNull final Roster roster,
-            @NonNull final SemanticVersion softwareVersion,
-            @NonNull final PlatformStateFacade platformStateFacade) {
-
+    public SwirldStateManager(@NonNull final PlatformContext platformContext, @NonNull final Roster roster) {
         requireNonNull(platformContext);
         requireNonNull(roster);
-        this.platformStateFacade = requireNonNull(platformStateFacade);
         this.stateMetrics = new StateMetrics(platformContext.getMetrics());
-        this.softwareVersion = requireNonNull(softwareVersion);
     }
 
     /**
@@ -77,9 +60,7 @@ public void setState(@NonNull final MerkleNodeState state, boolean onInit) {
             throw new IllegalStateException("Attempt to set initial state when there is already a state reference.");
         }
 
-        // Create a fast copy so there is always an immutable state to
-        // invoke handleTransaction on for pre-consensus transactions
-        fastCopyAndUpdateRefs(state);
+        updateStateRefs(state);
     }
 
     /**
@@ -90,13 +71,20 @@ public MerkleNodeState getConsensusState() {
         return stateRef.get();
     }
 
-    private void fastCopyAndUpdateRefs(final MerkleNodeState state) {
-        final MerkleNodeState newState = fastCopy(state, stateMetrics, softwareVersion, platformStateFacade);
-
+    private void updateStateRefs(MerkleNodeState state) {
+        // Create a fast copy so there is always an immutable state to
+        // invoke handleTransaction on for pre-consensus transactions
+        final long copyStart = System.nanoTime();
+        // Create a fast copy
+        final MerkleNodeState copy = state.copy();
+        // Increment the reference count because this reference becomes the new value
+        copy.getRoot().reserve();
+        final long copyEnd = System.nanoTime();
+        stateMetrics.stateCopyMicros((copyEnd - copyStart) * NANOSECONDS_TO_MICROSECONDS);
         // Set latest immutable first to prevent the newly immutable stateRoot from being deleted between setting the
         // stateRef and the latestImmutableState
         setLatestImmutableState(state);
-        updateStateRef(newState);
+        updateStateRef(copy);
     }
 
     /**
@@ -136,7 +124,8 @@ private void setLatestImmutableState(final MerkleNodeState immutableState) {
      * @see State#copy()
      */
     public MerkleNodeState getStateForSigning() {
-        fastCopyAndUpdateRefs(stateRef.get());
+        final MerkleNodeState state = stateRef.get();
+        updateStateRefs(state);
         return latestImmutableState.get();
     }
 }

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/SwirldStateManagerUtils.java

@@ -116,7 +116,6 @@
     requires transitive com.swirlds.config.api;
     requires transitive com.swirlds.metrics.api;
     requires transitive com.swirlds.state.api;
-    requires transitive com.swirlds.state.impl;
     requires transitive com.swirlds.virtualmap;
     requires transitive org.hiero.base.concurrent;
     requires transitive org.hiero.base.crypto;
@@ -132,6 +131,7 @@
     requires com.swirlds.config.extensions;
     requires com.swirlds.logging;
     requires com.swirlds.merkledb;
+    requires com.swirlds.state.impl;
     requires com.fasterxml.jackson.core;
     requires com.fasterxml.jackson.dataformat.yaml;
     requires com.github.spotbugs.annotations;

platform-sdk/swirlds-platform-core/src/main/java/module-info.java

@@ -66,8 +66,7 @@ public TransactionHandlerTester(final Roster roster) {
                 .when(consensusStateEventHandler)
                 .onHandleConsensusRound(any(), same(consensusState), any());
         final StatusActionSubmitter statusActionSubmitter = submittedActions::add;
-        swirldStateManager = new SwirldStateManager(
-                platformContext, roster, SemanticVersion.newBuilder().major(1).build(), platformStateFacade);
+        swirldStateManager = new SwirldStateManager(platformContext, roster);
         swirldStateManager.setState(consensusState, true);
         defaultTransactionHandler = new DefaultTransactionHandler(
                 platformContext,

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/eventhandling/TransactionHandlerTester.java

@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.swirlds.platform.state;
 
-import static com.swirlds.platform.test.fixtures.state.TestPlatformStateFacade.TEST_PLATFORM_STATE_FACADE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.mockito.Mockito.mock;
 
 import com.hedera.hapi.node.base.SemanticVersion;
 import com.swirlds.merkledb.test.fixtures.MerkleDbTestUtils;
+import com.swirlds.platform.test.fixtures.state.TestPlatformStateFacade;
 import com.swirlds.platform.test.fixtures.state.TestingAppStateInitializer;
 import com.swirlds.state.MerkleNodeState;
-import com.swirlds.state.State;
-import com.swirlds.state.merkle.StateMetrics;
 import com.swirlds.state.test.fixtures.merkle.TestVirtualMapState;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -25,11 +22,16 @@ void testFastCopyIsMutable() {
         final MerkleNodeState state = TestVirtualMapState.createInstanceWithVirtualMapLabel(virtualMapLabel);
         TestingAppStateInitializer.initPlatformState(state);
         state.getRoot().reserve();
-        final StateMetrics stats = mock(StateMetrics.class);
-        final State result = SwirldStateManagerUtils.fastCopy(
-                state, stats, SemanticVersion.newBuilder().major(1).build(), TEST_PLATFORM_STATE_FACADE);
 
-        assertFalse(result.isImmutable(), "The copy state should be mutable.");
+        final SemanticVersion softwareVersion =
+                SemanticVersion.newBuilder().major(1).build();
+        // Create a fast copy
+        final MerkleNodeState copy = state.copy();
+        TestPlatformStateFacade.TEST_PLATFORM_STATE_FACADE.setCreationSoftwareVersionTo(copy, softwareVersion);
+        // Increment the reference count because this reference becomes the new value
+        copy.getRoot().reserve();
+
+        assertFalse(copy.isImmutable(), "The copy state should be mutable.");
         assertEquals(
                 1,
                 state.getRoot().getReservationCount(),
@@ -39,7 +41,7 @@ void testFastCopyIsMutable() {
                 state.getRoot().getReservationCount(),
                 "Fast copy should return a new state with a reference count of 1.");
         state.release();
-        result.release();
+        copy.release();
     }
 
     @AfterEach

platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/state/StateEventHandlerManagerUtilsTests.java

@@ -41,8 +41,7 @@ void setup() {
         final PlatformContext platformContext =
                 TestPlatformContextBuilder.create().build();
 
-        swirldStateManager = new SwirldStateManager(
-                platformContext, roster, SemanticVersion.newBuilder().major(1).build(), platformStateFacade);
+        swirldStateManager = new SwirldStateManager(platformContext, roster);
         swirldStateManager.setState(initialState, true);
     }