chore: Cleanup legacy system account cleanup code (#21849)

Signed-off-by: Derek Riley <derek.riley@swirldslabs.com>

Author: derektriley

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/HandleWorkflow.java

@@ -162,8 +162,6 @@ public class HandleWorkflow {
     private final PlatformStateFacade platformStateFacade;
     // Flag to indicate whether we have checked for transplant updates after JVM started
     private boolean checkedForTransplant;
-    // Flag whether the 0.65 system account cleanup has been done; can be removed after that release
-    private boolean systemAccountCleanupDone;
 
     @Inject
     public HandleWorkflow(
@@ -519,11 +517,6 @@ writableTokenStates, new WritableEntityIdStoreImpl(writableEntityIdStates)),
                 // Only update this if we are relying on RecordManager state for post-upgrade processing
                 blockRecordManager.markMigrationRecordsStreamed();
             }
-        } else {
-            if (!systemAccountCleanupDone) {
-                // Ensure the system account cleanup is finished post-upgrade
-                systemAccountCleanupDone = systemTransactions.do066SystemAccountCleanup(consensusNow, state);
-            }
         }
 
         final var topLevelTxn =

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/handle/record/SystemTransactions.java

@@ -5,14 +5,12 @@
 import static com.hedera.hapi.node.base.ResponseCodeEnum.SUCCESS;
 import static com.hedera.hapi.node.base.ResponseCodeEnum.SUCCESS_BUT_MISSING_EXPECTED_OPERATION;
 import static com.hedera.hapi.util.HapiUtils.asTimestamp;
-import static com.hedera.node.app.hapi.utils.EntityType.ACCOUNT;
 import static com.hedera.node.app.hapi.utils.keys.KeyUtils.IMMUTABILITY_SENTINEL_KEY;
 import static com.hedera.node.app.service.addressbook.impl.schemas.V053AddressBookSchema.parseEd25519NodeAdminKeysFrom;
 import static com.hedera.node.app.service.entityid.impl.schemas.V0490EntityIdSchema.ENTITY_ID_STATE_ID;
 import static com.hedera.node.app.service.entityid.impl.schemas.V0590EntityIdSchema.ENTITY_COUNTS_STATE_ID;
 import static com.hedera.node.app.service.file.impl.schemas.V0490FileSchema.dispatchSynthFileUpdate;
 import static com.hedera.node.app.service.file.impl.schemas.V0490FileSchema.parseConfigList;
-import static com.hedera.node.app.service.token.impl.schemas.V0490TokenSchema.ACCOUNTS_STATE_ID;
 import static com.hedera.node.app.service.token.impl.schemas.V0610TokenSchema.dispatchSynthNodeRewards;
 import static com.hedera.node.app.spi.workflows.HandleContext.TransactionCategory.NODE;
 import static com.hedera.node.app.util.FileUtilities.createFileID;
@@ -25,28 +23,21 @@
 import static java.util.Objects.requireNonNull;
 import static org.hiero.consensus.roster.RosterUtils.formatNodeName;
 
-import com.hedera.hapi.block.stream.BlockItem;
-import com.hedera.hapi.block.stream.output.StateChange;
-import com.hedera.hapi.block.stream.output.StateChanges;
 import com.hedera.hapi.node.addressbook.NodeCreateTransactionBody;
 import com.hedera.hapi.node.addressbook.NodeDeleteTransactionBody;
 import com.hedera.hapi.node.addressbook.NodeUpdateTransactionBody;
-import com.hedera.hapi.node.base.AccountAmount;
 import com.hedera.hapi.node.base.AccountID;
 import com.hedera.hapi.node.base.CurrentAndNextFeeSchedule;
 import com.hedera.hapi.node.base.Duration;
 import com.hedera.hapi.node.base.Key;
 import com.hedera.hapi.node.base.ResponseCodeEnum;
 import com.hedera.hapi.node.base.ServiceEndpoint;
 import com.hedera.hapi.node.base.TransactionID;
-import com.hedera.hapi.node.base.TransferList;
 import com.hedera.hapi.node.state.common.EntityNumber;
 import com.hedera.hapi.node.state.entity.EntityCounts;
 import com.hedera.hapi.node.state.roster.RosterEntry;
-import com.hedera.hapi.node.state.token.Account;
 import com.hedera.hapi.node.state.token.StakingNodeInfo;
 import com.hedera.hapi.node.token.CryptoCreateTransactionBody;
-import com.hedera.hapi.node.token.CryptoTransferTransactionBody;
 import com.hedera.hapi.node.transaction.TransactionBody;
 import com.hedera.node.app.blocks.BlockStreamManager;
 import com.hedera.node.app.blocks.impl.ImmediateStateChangeListener;
@@ -94,7 +85,6 @@
 import com.swirlds.config.api.Configuration;
 import com.swirlds.platform.system.InitTrigger;
 import com.swirlds.state.State;
-import com.swirlds.state.spi.CommittableWritableStates;
 import com.swirlds.state.spi.WritableSingletonState;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.io.IOException;
@@ -103,7 +93,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
@@ -409,84 +398,6 @@ ctx, createFileID(filesConfig.hapiPermissions(), config), bytes),
         autoNodeAdminKeyUpdates.tryIfPresent(adminConfig.upgradeSysFilesLoc(), systemContext);
     }
 
-    /**
-     * Cleans up council-controlled system accounts that are no longer needed.
-     * @param now the current time
-     * @param state the state to clean up
-     * @return true if the cleanup was finished, false otherwise
-     */
-    public boolean do066SystemAccountCleanup(@NonNull final Instant now, @NonNull final State state) {
-        requireNonNull(state);
-        requireNonNull(now);
-        final AtomicReference<AccountID> legacyAccountId = new AtomicReference<>();
-        final Consumer<Consumer<List<StateChange>>> removeLegacyAccount = cb -> {
-            if (streamMode != RECORDS) {
-                immediateStateChangeListener.resetKvStateChanges(null);
-            }
-            // On success, actually remove the legacy account from state
-            final var tokenStates = state.getWritableStates(TokenService.NAME);
-            final var accountsState = tokenStates.<AccountID, Account>get(ACCOUNTS_STATE_ID);
-            accountsState.remove(legacyAccountId.get());
-            ((CommittableWritableStates) tokenStates).commit();
-            if (streamMode != RECORDS) {
-                final var changes = immediateStateChangeListener.getKvStateChanges();
-                if (!changes.isEmpty()) {
-                    cb.accept(changes);
-                }
-            }
-            // And decrement the entity count for the account type
-            final var entityStates = state.getWritableStates(EntityIdService.NAME);
-            final var entityCounters = new WritableEntityIdStoreImpl(entityStates);
-            entityCounters.adjustEntityCount(ACCOUNT, -1);
-            ((CommittableWritableStates) entityStates).commit();
-        };
-        // System context for dispatching CryptoTransfer with an onSuccess callback
-        // that completely removes the legacy account from state after the dispatch
-        // sweeping its dust HBAR into the fee collection account 0.0.98
-        final var systemContext = newSystemContext(
-                now,
-                state,
-                dispatch -> removeLegacyAccount.accept(
-                        changes -> dispatch.streamBuilder().stateChanges(changes)),
-                UseReservedConsensusTimes.YES,
-                TriggerStakePeriodSideEffects.YES);
-        long i = FIRST_SYSTEM_FILE_ENTITY;
-        final var feeCollectionId = idFactory.newAccountId(configProvider
-                .getConfiguration()
-                .getConfigData(LedgerConfig.class)
-                .fundingAccount());
-        final var accountsState = state.getReadableStates(TokenService.NAME).<AccountID, Account>get(ACCOUNTS_STATE_ID);
-        for (; i < FIRST_POST_SYSTEM_FILE_ENTITY && systemContext.hasDispatchesRemaining(); i++) {
-            final var accountId = idFactory.newAccountId(i);
-            final var legacyAccount = accountsState.get(accountId);
-            if (legacyAccount != null) {
-                legacyAccountId.set(accountId);
-                final long balance = legacyAccount.tinybarBalance();
-                if (balance > 0) {
-                    log.info("Sweeping {} tinybars from {} @ {}", balance, accountId, systemContext.now());
-                    systemContext.dispatchAdmin(b -> b.cryptoTransfer(CryptoTransferTransactionBody.newBuilder()
-                            .transfers(TransferList.newBuilder()
-                                    .accountAmounts(List.of(
-                                            AccountAmount.newBuilder()
-                                                    .accountID(accountId)
-                                                    .amount(-balance)
-                                                    .build(),
-                                            AccountAmount.newBuilder()
-                                                    .accountID(feeCollectionId)
-                                                    .amount(+balance)
-                                                    .build()))
-                                    .build())));
-                } else {
-                    log.info("Removing zero-balance legacy account {} @ {}", accountId, systemContext.now());
-                    removeLegacyAccount.accept(changes -> blockStreamManager.writeItem((t) -> BlockItem.newBuilder()
-                            .stateChanges(new StateChanges(t, new ArrayList<>(changes)))
-                            .build()));
-                }
-            }
-        }
-        return i == FIRST_POST_SYSTEM_FILE_ENTITY;
-    }
-
     /**
      * Dispatches a synthetic node reward crypto transfer for the given active node accounts.
      * If the {@link NodesConfig#minPerPeriodNodeRewardUsd()} is greater than zero, inactive nodes will receive the minimum node