Addressed Artem's comment

Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>

hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/AddressBookServiceImpl.java

@@ -19,7 +19,7 @@
 import com.hedera.node.app.service.addressbook.AddressBookService;
 import com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema;
 import com.hedera.node.app.spi.RpcService;
-import com.swirlds.state.merkle.SchemaRegistry;
+import com.swirlds.state.lifecycle.SchemaRegistry;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**

hedera-node/hedera-addressbook-service-impl/src/main/java/com/hedera/node/app/service/addressbook/impl/schemas/V053AddressBookSchema.java

@@ -36,9 +36,9 @@
 import com.hedera.node.config.data.FilesConfig;
 import com.hedera.pbj.runtime.ParseException;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.StateDefinition;
 import com.swirlds.state.spi.ReadableKVState;
 import com.swirlds.state.spi.WritableKVState;
 import edu.umd.cs.findbugs.annotations.NonNull;

hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/AddressBookServiceImplTest.java

@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.verify;
 
 import com.hedera.node.app.service.addressbook.impl.AddressBookServiceImpl;
-import com.swirlds.state.merkle.SchemaRegistry;
+import com.swirlds.state.lifecycle.SchemaRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

hedera-node/hedera-addressbook-service-impl/src/test/java/com/hedera/node/app/service/addressbook/impl/test/schemas/V053AddressBookSchemaTest.java

@@ -43,9 +43,9 @@
 import com.hedera.node.app.spi.fixtures.util.LoggingTarget;
 import com.hedera.node.config.testfixtures.HederaTestConfigBuilder;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.StateDefinition;
-import com.swirlds.state.merkle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.StateDefinition;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
 import com.swirlds.state.test.fixtures.MapWritableKVState;
 import java.util.ArrayList;
 import java.util.HashMap;

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/AppContext.java

@@ -20,11 +20,12 @@
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.node.app.spi.signatures.SignatureVerifier;
 import com.swirlds.common.crypto.Signature;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.time.InstantSource;
 
 /**
- * Gives context to {@link com.swirlds.state.merkle.Service} implementations on how the application workflows will do
+ * Gives context to {@link Service} implementations on how the application workflows will do
  * shared functions like verifying signatures or computing the current instant.
  */
 public interface AppContext {

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/RpcService.java

@@ -17,7 +17,7 @@
 package com.hedera.node.app.spi;
 
 import com.hedera.pbj.runtime.RpcServiceDefinition;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Set;
 

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/HandleContext.java

@@ -36,8 +36,8 @@
 import com.hedera.node.app.spi.workflows.record.ExternalizedRecordCustomizer;
 import com.hedera.node.app.spi.workflows.record.StreamBuilder;
 import com.swirlds.config.api.Configuration;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.time.Instant;

hedera-node/hedera-app-spi/src/main/java/com/hedera/node/app/spi/workflows/SystemContext.java

@@ -18,7 +18,7 @@
 
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.swirlds.config.api.Configuration;
-import com.swirlds.state.merkle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.time.Instant;
 

hedera-node/hedera-app-spi/src/test/java/com/hedera/node/app/spi/state/SchemaTest.java

@@ -22,7 +22,7 @@
 import com.hedera.hapi.node.base.SemanticVersion;
 import com.hedera.node.app.spi.fixtures.state.MapWritableStates;
 import com.swirlds.platform.test.fixtures.state.TestSchema;
-import com.swirlds.state.merkle.Schema;
+import com.swirlds.state.lifecycle.Schema;
 import com.swirlds.state.test.fixtures.StateTestBase;
 import java.util.ArrayList;
 import java.util.Collections;

hedera-node/hedera-app-spi/src/test/java/com/hedera/node/app/spi/state/StateDefinitionTest.java

@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.hedera.pbj.runtime.Codec;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.StateDefinition;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;

hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/TestService.java

@@ -20,9 +20,9 @@
 
 import com.hedera.node.app.hapi.utils.ethereum.EthTxData;
 import com.swirlds.platform.test.fixtures.state.TestSchema;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.ArrayList;
 import java.util.List;

hedera-node/hedera-app-spi/src/testFixtures/java/com/hedera/node/app/spi/fixtures/info/FakeNetworkInfo.java

@@ -24,8 +24,8 @@
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.platform.NodeId;
 import com.swirlds.state.State;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;

hedera-node/hedera-app/src/jmh/java/com/hedera/node/app/blocks/BlockStreamManagerBenchmark.java

@@ -58,7 +58,7 @@
 import com.swirlds.platform.system.Round;
 import com.swirlds.platform.system.events.ConsensusEvent;
 import com.swirlds.platform.system.state.notifications.StateHashedNotification;
-import com.swirlds.state.merkle.Schema;
+import com.swirlds.state.lifecycle.Schema;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.ByteArrayOutputStream;

hedera-node/hedera-app/src/jmh/java/com/hedera/node/app/blocks/StandaloneRoundManagement.java

@@ -59,7 +59,7 @@
 import com.swirlds.platform.system.Round;
 import com.swirlds.platform.system.events.ConsensusEvent;
 import com.swirlds.platform.system.state.notifications.StateHashedNotification;
-import com.swirlds.state.merkle.Schema;
+import com.swirlds.state.lifecycle.Schema;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.io.IOException;

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

@@ -147,7 +147,7 @@
 import com.swirlds.platform.system.transaction.Transaction;
 import com.swirlds.state.State;
 import com.swirlds.state.StateChangeListener;
-import com.swirlds.state.merkle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
 import com.swirlds.state.spi.WritableSingletonStateBase;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;

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

@@ -64,8 +64,8 @@
 import com.swirlds.platform.system.InitTrigger;
 import com.swirlds.platform.system.Platform;
 import com.swirlds.state.State;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import dagger.BindsInstance;
 import dagger.Component;
 import java.nio.charset.Charset;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/BlockStreamModule.java

@@ -21,7 +21,7 @@
 import com.hedera.node.app.blocks.impl.GrpcBlockItemWriter;
 import com.hedera.node.config.ConfigProvider;
 import com.hedera.node.config.data.BlockStreamConfig;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/BlockStreamService.java

@@ -20,8 +20,8 @@
 
 import com.hedera.node.app.blocks.schemas.V0560BlockStreamSchema;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Optional;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/FileBlockItemWriter.java

@@ -16,7 +16,7 @@
 
 package com.hedera.node.app.blocks.impl;
 
-import static com.swirlds.state.merkle.HapiUtils.asAccountString;
+import static com.swirlds.state.lifecycle.HapiUtils.asAccountString;
 import static java.util.Objects.requireNonNull;
 
 import com.hedera.hapi.block.stream.schema.BlockSchema;
@@ -27,7 +27,7 @@
 import com.hedera.pbj.runtime.ProtoWriterTools;
 import com.hedera.pbj.runtime.io.buffer.BufferedData;
 import com.hedera.pbj.runtime.io.stream.WritableStreamingData;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.BufferedOutputStream;
 import java.io.IOException;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/schemas/V0560BlockStreamSchema.java

@@ -26,9 +26,9 @@
 import com.hedera.hapi.node.state.blockstream.BlockStreamInfo;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.config.api.Configuration;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.StateDefinition;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Set;
 import java.util.function.Consumer;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/FeeService.java

@@ -17,8 +17,8 @@
 package com.hedera.node.app.fees;
 
 import com.hedera.node.app.fees.schemas.V0490FeeSchema;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class FeeService implements Service {

hedera-node/hedera-app/src/main/java/com/hedera/node/app/fees/schemas/V0490FeeSchema.java

@@ -21,9 +21,9 @@
 import com.hedera.hapi.node.transaction.ExchangeRate;
 import com.hedera.hapi.node.transaction.ExchangeRateSet;
 import com.hedera.node.config.data.BootstrapConfig;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.StateDefinition;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Set;
 

hedera-node/hedera-app/src/main/java/com/hedera/node/app/ids/EntityIdService.java

@@ -17,8 +17,8 @@
 package com.hedera.node.app.ids;
 
 import com.hedera.node.app.ids.schemas.V0490EntityIdSchema;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**

hedera-node/hedera-app/src/main/java/com/hedera/node/app/ids/schemas/V0490EntityIdSchema.java

@@ -19,9 +19,9 @@
 import com.hedera.hapi.node.base.SemanticVersion;
 import com.hedera.hapi.node.state.common.EntityNumber;
 import com.hedera.node.config.data.HederaConfig;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.StateDefinition;
 import com.swirlds.state.spi.ReadableStates;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Set;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/GenesisNetworkInfo.java

@@ -23,8 +23,8 @@
 import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.state.State;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.LinkedHashMap;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/InfoInjectionModule.java

@@ -18,7 +18,7 @@
 
 import com.hedera.hapi.node.base.AccountID;
 import com.hedera.node.app.annotations.NodeSelfId;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import dagger.Module;
 import dagger.Provides;
 import edu.umd.cs.findbugs.annotations.NonNull;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/NodeInfoImpl.java

@@ -21,7 +21,7 @@
 import com.hedera.hapi.node.state.addressbook.Node;
 import com.hedera.hapi.node.state.roster.RosterEntry;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/StateNetworkInfo.java

@@ -33,8 +33,8 @@
 import com.swirlds.platform.state.service.PlatformStateService;
 import com.swirlds.platform.state.service.ReadablePlatformStateStore;
 import com.swirlds.state.State;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import com.swirlds.state.spi.ReadableKVState;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/info/UnavailableNetworkInfo.java

@@ -19,8 +19,8 @@
 import com.hedera.hapi.node.state.roster.Roster;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.state.State;
-import com.swirlds.state.merkle.info.NetworkInfo;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NetworkInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.List;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/BlockRecordService.java

@@ -20,8 +20,8 @@
 import com.hedera.node.app.records.impl.BlockRecordManagerImpl;
 import com.hedera.node.app.records.schemas.V0490BlockRecordSchema;
 import com.hedera.node.app.records.schemas.V0560BlockRecordSchema;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import javax.inject.Singleton;
 

hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/BlockRecordWriterFactoryImpl.java

@@ -24,7 +24,7 @@
 import com.hedera.node.config.ConfigProvider;
 import com.hedera.node.config.data.BlockRecordStreamConfig;
 import com.swirlds.common.stream.Signer;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.nio.file.FileSystem;
 import javax.inject.Inject;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/impl/producers/formats/v6/BlockRecordWriterV6.java

@@ -29,7 +29,7 @@
 import static com.hedera.pbj.runtime.ProtoWriterTools.writeLong;
 import static com.hedera.pbj.runtime.ProtoWriterTools.writeMessage;
 import static com.swirlds.common.stream.LinkedObjectStreamUtilities.convertInstantToStringWithPadding;
-import static com.swirlds.state.merkle.HapiUtils.asAccountString;
+import static com.swirlds.state.lifecycle.HapiUtils.asAccountString;
 import static java.util.Objects.requireNonNull;
 
 import com.hedera.hapi.node.base.SemanticVersion;
@@ -46,7 +46,7 @@
 import com.swirlds.common.crypto.DigestType;
 import com.swirlds.common.crypto.HashingOutputStream;
 import com.swirlds.common.stream.Signer;
-import com.swirlds.state.merkle.info.NodeInfo;
+import com.swirlds.state.lifecycle.info.NodeInfo;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.BufferedOutputStream;
 import java.io.IOException;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/schemas/V0490BlockRecordSchema.java

@@ -22,9 +22,9 @@
 import com.hedera.hapi.node.state.blockrecords.BlockInfo;
 import com.hedera.hapi.node.state.blockrecords.RunningHashes;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
-import com.swirlds.state.merkle.StateDefinition;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
+import com.swirlds.state.lifecycle.StateDefinition;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;

hedera-node/hedera-app/src/main/java/com/hedera/node/app/records/schemas/V0560BlockRecordSchema.java

@@ -20,8 +20,8 @@
 import static com.hedera.node.app.records.schemas.V0490BlockRecordSchema.RUNNING_HASHES_STATE_KEY;
 
 import com.hedera.hapi.node.base.SemanticVersion;
-import com.swirlds.state.merkle.MigrationContext;
-import com.swirlds.state.merkle.Schema;
+import com.swirlds.state.lifecycle.MigrationContext;
+import com.swirlds.state.lifecycle.Schema;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class V0560BlockRecordSchema extends Schema {

hedera-node/hedera-app/src/main/java/com/hedera/node/app/roster/RosterService.java

@@ -20,8 +20,8 @@
 
 import com.swirlds.common.RosterStateId;
 import com.swirlds.platform.state.service.schemas.V0540RosterSchema;
-import com.swirlds.state.merkle.SchemaRegistry;
-import com.swirlds.state.merkle.Service;
+import com.swirlds.state.lifecycle.SchemaRegistry;
+import com.swirlds.state.lifecycle.Service;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 /**