feat: HIP-904 Introduce unlimitedAutoAssociations feature flag

hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/EntitiesConfig.java

@@ -24,4 +24,5 @@
 public record EntitiesConfig(
         @ConfigProperty(defaultValue = "3153600000") @NetworkProperty long maxLifetime,
         // @ConfigProperty(defaultValue = "FILE") Set<EntityType> systemDeletable
-        @ConfigProperty(defaultValue = "false") @NetworkProperty boolean limitTokenAssociations) {}
+        @ConfigProperty(defaultValue = "false") @NetworkProperty boolean limitTokenAssociations,
+        @ConfigProperty(defaultValue = "true") @NetworkProperty boolean unlimitedAutoAssociationsEnabled) {}

hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/BaseTokenHandler.java

@@ -334,6 +334,7 @@ protected TokenRelation autoAssociate(
                 entitiesConfig.limitTokenAssociations() && numAssociations >= tokensConfig.maxPerAccount(),
                 TOKENS_PER_ACCOUNT_LIMIT_EXCEEDED);
 
+        // TODO: check for unlimited associations flag and include -1 as infinite associations
         final var maxAutoAssociations = account.maxAutoAssociations();
         final var usedAutoAssociations = account.usedAutoAssociations();
         validateFalse(usedAutoAssociations >= maxAutoAssociations, NO_REMAINING_AUTOMATIC_ASSOCIATIONS);

hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/handlers/CryptoUpdateHandler.java

@@ -275,14 +275,16 @@ private void validateSemantics(
         // validate auto associations
         if (op.hasMaxAutomaticTokenAssociations()) {
             final long newMax = builderAccount.maxAutoAssociations();
+            // first validate if the associations are limited and the new max is within
+            validateFalse(
+                    entitiesConfig.limitTokenAssociations() && newMax > tokensConfig.maxPerAccount(),
+                    REQUESTED_NUM_AUTOMATIC_ASSOCIATIONS_EXCEEDS_ASSOCIATION_LIMIT);
+            // TODO: check for unlimited associations flag and include -1 as infinite associations
             validateFalse(
                     newMax < updateAccount.usedAutoAssociations(), EXISTING_AUTOMATIC_ASSOCIATIONS_EXCEED_GIVEN_LIMIT);
             validateFalse(
                     newMax > ledgerConfig.maxAutoAssociations(),
                     REQUESTED_NUM_AUTOMATIC_ASSOCIATIONS_EXCEEDS_ASSOCIATION_LIMIT);
-            validateFalse(
-                    entitiesConfig.limitTokenAssociations() && newMax > tokensConfig.maxPerAccount(),
-                    REQUESTED_NUM_AUTOMATIC_ASSOCIATIONS_EXCEEDS_ASSOCIATION_LIMIT);
         }
 
         // validate if account is not deleted

hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/validators/CryptoCreateValidator.java

@@ -98,7 +98,9 @@ public boolean tooManyAutoAssociations(
             @NonNull final LedgerConfig ledgerConfig,
             @NonNull final EntitiesConfig entitiesConfig,
             @NonNull final TokensConfig tokensConfig) {
-        return n > ledgerConfig.maxAutoAssociations()
-                || (entitiesConfig.limitTokenAssociations() && n > tokensConfig.maxPerAccount());
+        return (entitiesConfig.limitTokenAssociations() && n > tokensConfig.maxPerAccount())
+                || n > ledgerConfig.maxAutoAssociations()
+                || (n < 0 && !entitiesConfig.unlimitedAutoAssociationsEnabled())
+                || (n < -1 && entitiesConfig.unlimitedAutoAssociationsEnabled());
     }
 }

hedera-node/hedera-token-service-impl/src/test/java/com/hedera/node/app/service/token/impl/test/validators/CryptoCreateValidatorTest.java

@@ -58,7 +58,8 @@ void setUp() {
                 .withValue("cryptoCreateWithAlias.enabled", true)
                 .withValue("ledger.maxAutoAssociations", 5000)
                 .withValue("entities.limitTokenAssociations", false)
-                .withValue("tokens.maxPerAccount", 1000);
+                .withValue("tokens.maxPerAccount", 1000)
+                .withValue("entities.unlimitedAutoAssociations", true);
     }
 
     //    @Test
@@ -116,6 +117,7 @@ void checkTooManyAutoAssociations() {
         getConfigs(configuration);
         assertTrue(subject.tooManyAutoAssociations(5001, ledgerConfig, entitiesConfig, tokensConfig));
         assertFalse(subject.tooManyAutoAssociations(3000, ledgerConfig, entitiesConfig, tokensConfig));
+        assertFalse(subject.tooManyAutoAssociations(-1, ledgerConfig, entitiesConfig, tokensConfig));
     }
 
     @Test
@@ -125,6 +127,9 @@ void checkDiffTooManyAutoAssociations() {
         getConfigs(configuration);
         assertTrue(subject.tooManyAutoAssociations(1001, ledgerConfig, entitiesConfig, tokensConfig));
         assertFalse(subject.tooManyAutoAssociations(999, ledgerConfig, entitiesConfig, tokensConfig));
+        assertFalse(subject.tooManyAutoAssociations(-1, ledgerConfig, entitiesConfig, tokensConfig));
+        assertTrue(subject.tooManyAutoAssociations(-2, ledgerConfig, entitiesConfig, tokensConfig));
+        assertTrue(subject.tooManyAutoAssociations(-100000, ledgerConfig, entitiesConfig, tokensConfig));
     }
 
     private void getConfigs(Configuration configuration) {

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/spec/utilops/FeatureFlags.java

@@ -63,6 +63,8 @@ private Map<String, String> all(final String choice, @NonNull final List<String>
         "contracts.precompile.atomicCryptoTransfer.enabled",
         "scheduling.longTermEnabled",
         // Not being tested
-        "contracts.evm.version.dynamic"
+        "contracts.evm.version.dynamic",
+        // HIP-904
+        "entities.unlimitedAutoAssociationsEnabled"
     };
 }