Merge branch 'develop' into 12526-automate-deduplicator

Signed-off-by: Cody Littley <[email protected]>

Author: Cody Littley

.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/workflows/ingest/SubmissionManager.java

@@ -26,6 +26,7 @@
 import com.hedera.node.app.state.DeduplicationCache;
 import com.hedera.node.config.ConfigProvider;
 import com.hedera.node.config.data.HederaConfig;
+import com.hedera.node.config.data.LedgerConfig;
 import com.hedera.node.config.data.StatsConfig;
 import com.hedera.node.config.types.Profile;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
@@ -70,6 +71,9 @@ public class SubmissionManager {
 
     private static final String PLATFORM_TXN_REJECTIONS_DESC = "number of platform transactions not created per second";
     private static final String SPEEDOMETER_FORMAT = "%,13.2f";
+    private static final Bytes MAIN_NET_LEDGER_ID = Bytes.fromHex("00");
+    private static final Bytes TEST_NET_LEDGER_ID = Bytes.fromHex("01");
+    private static final Bytes PREVIEW_NET_LEDGER_ID = Bytes.fromHex("02");
 
     // FUTURE Consider adding a metric to keep track of the number of duplicate transactions submitted by users.
 
@@ -130,8 +134,13 @@ public void submit(@NonNull final TransactionBody txBody, @NonNull final Bytes t
         if (txBody.hasUncheckedSubmit()) {
             // We do NOT allow this call in production!
             // check profile dynamically, this way we allow profile overriding in Hapi tests
-            final var hederaConfig = configProvider.getConfiguration().getConfigData(HederaConfig.class);
-            if (hederaConfig.activeProfile() == Profile.PROD) {
+            final var configuration = configProvider.getConfiguration();
+            final var hederaConfig = configuration.getConfigData(HederaConfig.class);
+            final var ledgerConfig = configuration.getConfigData(LedgerConfig.class);
+            if (hederaConfig.activeProfile() == Profile.PROD
+                    || MAIN_NET_LEDGER_ID.equals(ledgerConfig.id())
+                    || TEST_NET_LEDGER_ID.equals(ledgerConfig.id())
+                    || PREVIEW_NET_LEDGER_ID.equals(ledgerConfig.id())) {
                 throw new PreCheckException(PLATFORM_TRANSACTION_NOT_CREATED);
             }
 

hedera-node/hedera-app/src/test/java/com/hedera/node/app/workflows/ingest/SubmissionManagerTest.java

@@ -202,6 +202,7 @@ void setup() {
             config = () -> new VersionedConfigImpl(
                     HederaTestConfigBuilder.create()
                             .withValue("hedera.profiles.active", Profile.TEST.toString())
+                            .withValue("ledger.id", "0x03")
                             .getOrCreateConfig(),
                     1);
             when(mockedMetrics.getOrCreate(any())).thenReturn(platformTxnRejections);
@@ -245,6 +246,85 @@ void testUncheckedSubmitInProdFails() {
             config = () -> new VersionedConfigImpl(
                     HederaTestConfigBuilder.create()
                             .withValue("hedera.profiles.active", Profile.PROD.toString())
+                            .withValue("ledger.id", "0x03")
+                            .getOrCreateConfig(),
+                    1);
+            submissionManager = new SubmissionManager(platform, deduplicationCache, config, mockedMetrics);
+
+            // When we submit an unchecked transaction, and separate bytes, then the
+            // submission FAILS because we are in PROD mode
+            assertThatThrownBy(() -> submissionManager.submit(txBody, bytes))
+                    .isInstanceOf(PreCheckException.class)
+                    .hasFieldOrPropertyWithValue("responseCode", PLATFORM_TRANSACTION_NOT_CREATED);
+
+            // Then the platform NEVER sees the unchecked bytes
+            verify(platform, never()).createTransaction(uncheckedBytes);
+            // We never attempted to submit this tx to the platform, so we don't increase the metric
+            verify(platformTxnRejections, never()).cycle();
+            // And the deduplication cache is not updated
+            verify(deduplicationCache, never()).add(any());
+        }
+
+        @Test
+        @DisplayName("An unchecked transaction on MainNet WILL FAIL")
+        void testUncheckedSubmitOnMainNetFails() {
+            // Given we are in PROD mode
+            config = () -> new VersionedConfigImpl(
+                    HederaTestConfigBuilder.create()
+                            .withValue("hedera.profiles.active", Profile.TEST.toString())
+                            .withValue("ledger.id", "0x00")
+                            .getOrCreateConfig(),
+                    1);
+            submissionManager = new SubmissionManager(platform, deduplicationCache, config, mockedMetrics);
+
+            // When we submit an unchecked transaction, and separate bytes, then the
+            // submission FAILS because we are in PROD mode
+            assertThatThrownBy(() -> submissionManager.submit(txBody, bytes))
+                    .isInstanceOf(PreCheckException.class)
+                    .hasFieldOrPropertyWithValue("responseCode", PLATFORM_TRANSACTION_NOT_CREATED);
+
+            // Then the platform NEVER sees the unchecked bytes
+            verify(platform, never()).createTransaction(uncheckedBytes);
+            // We never attempted to submit this tx to the platform, so we don't increase the metric
+            verify(platformTxnRejections, never()).cycle();
+            // And the deduplication cache is not updated
+            verify(deduplicationCache, never()).add(any());
+        }
+
+        @Test
+        @DisplayName("An unchecked transaction on TestNet WILL FAIL")
+        void testUncheckedSubmitOnTestNetFails() {
+            // Given we are in PROD mode
+            config = () -> new VersionedConfigImpl(
+                    HederaTestConfigBuilder.create()
+                            .withValue("hedera.profiles.active", Profile.TEST.toString())
+                            .withValue("ledger.id", "0x01")
+                            .getOrCreateConfig(),
+                    1);
+            submissionManager = new SubmissionManager(platform, deduplicationCache, config, mockedMetrics);
+
+            // When we submit an unchecked transaction, and separate bytes, then the
+            // submission FAILS because we are in PROD mode
+            assertThatThrownBy(() -> submissionManager.submit(txBody, bytes))
+                    .isInstanceOf(PreCheckException.class)
+                    .hasFieldOrPropertyWithValue("responseCode", PLATFORM_TRANSACTION_NOT_CREATED);
+
+            // Then the platform NEVER sees the unchecked bytes
+            verify(platform, never()).createTransaction(uncheckedBytes);
+            // We never attempted to submit this tx to the platform, so we don't increase the metric
+            verify(platformTxnRejections, never()).cycle();
+            // And the deduplication cache is not updated
+            verify(deduplicationCache, never()).add(any());
+        }
+
+        @Test
+        @DisplayName("An unchecked transaction on PreviewNet WILL FAIL")
+        void testUncheckedSubmitOnPreviewNetFails() {
+            // Given we are in PROD mode
+            config = () -> new VersionedConfigImpl(
+                    HederaTestConfigBuilder.create()
+                            .withValue("hedera.profiles.active", Profile.TEST.toString())
+                            .withValue("ledger.id", "0x02")
                             .getOrCreateConfig(),
                     1);
             submissionManager = new SubmissionManager(platform, deduplicationCache, config, mockedMetrics);

hedera-node/hedera-smart-contract-service-impl/src/main/java/module-info.java

@@ -69,4 +69,5 @@
             com.hedera.node.app.service.contract.impl.test;
 
     exports com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.mint;
+    exports com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations;
 }

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/precompile/AssociatePrecompileV2SecurityModelSuite.java

@@ -16,6 +16,7 @@
 
 package com.hedera.services.bdd.suites.contract.precompile;
 
+import static com.hedera.services.bdd.junit.TestTags.SMART_CONTRACT;
 import static com.hedera.services.bdd.spec.HapiSpec.defaultHapiSpec;
 import static com.hedera.services.bdd.spec.assertions.ContractFnResultAsserts.resultWith;
 import static com.hedera.services.bdd.spec.assertions.TransactionRecordAsserts.recordWith;
@@ -56,6 +57,7 @@
 import static com.hederahashgraph.api.proto.java.TokenType.NON_FUNGIBLE_UNIQUE;
 
 import com.esaulpaugh.headlong.abi.Address;
+import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.associations.AssociationsTranslator;
 import com.hedera.services.bdd.junit.HapiTest;
 import com.hedera.services.bdd.junit.HapiTestSuite;
 import com.hedera.services.bdd.spec.HapiSpec;
@@ -66,8 +68,11 @@
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Tag;
 
 @HapiTestSuite
+@Tag(SMART_CONTRACT)
 public class AssociatePrecompileV2SecurityModelSuite extends HapiSuite {
 
     private static final Logger log = LogManager.getLogger(AssociatePrecompileV1SecurityModelSuite.class);
@@ -91,6 +96,7 @@ public class AssociatePrecompileV2SecurityModelSuite extends HapiSuite {
     private static final String ADMIN_KEY = "Admin key";
     private static final String CONTRACT_KEY = "ContractKey";
     private static final String MINT_TOKEN_CONTRACT = "MixedMintToken";
+    private static final String CALLCODE_CONTRACT = "MixedMintToken";
 
     public static void main(String... args) {
         new AssociatePrecompileV2SecurityModelSuite().runSuiteAsync();
@@ -623,7 +629,7 @@ final HapiSpec V2Security041TokenAssociateFromStaticcallAndCallcode() {
         return defaultHapiSpec("V2Security041TokenAssociateFromStaticcallAndCallcode")
                 .given(
                         cryptoCreate(ACCOUNT).balance(ONE_HUNDRED_HBARS),
-                        cryptoCreate(TOKEN_TREASURY),
+                        cryptoCreate(TOKEN_TREASURY).balance(THOUSAND_HBAR),
                         tokenCreate(FUNGIBLE_TOKEN)
                                 .tokenType(FUNGIBLE_COMMON)
                                 .supplyKey(TOKEN_TREASURY)
@@ -635,8 +641,9 @@ final HapiSpec V2Security041TokenAssociateFromStaticcallAndCallcode() {
                                 .initialSupply(0)
                                 .adminKey(TOKEN_TREASURY)
                                 .treasury(TOKEN_TREASURY),
-                        uploadInitCode(ASSOCIATE_CONTRACT, NESTED_ASSOCIATE_CONTRACT),
-                        contractCreate(ASSOCIATE_CONTRACT))
+                        uploadInitCode(ASSOCIATE_CONTRACT, NESTED_ASSOCIATE_CONTRACT, CALLCODE_CONTRACT),
+                        contractCreate(ASSOCIATE_CONTRACT),
+                        contractCreate(CALLCODE_CONTRACT))
                 .when(withOpContext((spec, opLog) -> allRunFor(
                         spec,
                         contractCreate(
@@ -646,6 +653,9 @@ final HapiSpec V2Security041TokenAssociateFromStaticcallAndCallcode() {
                         newKeyNamed(CONTRACT_KEY)
                                 .shape(THRESHOLD_KEY_SHAPE.signedWith(sigs(ON, NESTED_ASSOCIATE_CONTRACT))),
                         cryptoUpdate(ACCOUNT).key(CONTRACT_KEY),
+                        // Test Case 1: Account paying and signing a nested fungible TOKEN ASSOCIATE TRANSACTION,
+                        // when we associate the token to the signer
+                        // via STATICCALL
                         contractCall(
                                         NESTED_ASSOCIATE_CONTRACT,
                                         "associateStaticCall",
@@ -660,10 +670,40 @@ final HapiSpec V2Security041TokenAssociateFromStaticcallAndCallcode() {
                                 .gas(GAS_TO_OFFER)
                                 .hasKnownStatus(CONTRACT_REVERT_EXECUTED),
                         getTxnRecord("associateStaticcallFungibleTxn")
+                                .andAllChildRecords()
+                                .logged(),
+                        // Test Case 2: Account paying and signing a nested fungible TOKEN ASSOCIATE TRANSACTION,
+                        // when we associate the token to the signer
+                        // via CALLCODE
+                        // SIGNER → call → CONTRACT A → callcode → CONTRACT B → call → PRECOMPILE(HTS)
+                        contractCall(
+                                        CALLCODE_CONTRACT,
+                                        "callCodeToContractWithoutAmount",
+                                        asHeadlongAddress(getNestedContractAddress(ASSOCIATE_CONTRACT, spec)),
+                                        Bytes.wrap(AssociationsTranslator.ASSOCIATE_ONE
+                                                        .encodeCallWithArgs(
+                                                                HapiParserUtil.asHeadlongAddress(asAddress(
+                                                                        spec.registry()
+                                                                                .getAccountID(ACCOUNT))),
+                                                                HapiParserUtil.asHeadlongAddress(asAddress(
+                                                                        spec.registry()
+                                                                                .getTokenID(FUNGIBLE_TOKEN))))
+                                                        .array())
+                                                .toArray())
+                                .via("associateCallcodeFungibleTxn")
+                                .gas(GAS_TO_OFFER)
+                                .sending(ONE_HUNDRED_HBARS)
+                                .signedBy(TOKEN_TREASURY)
+                                .payingWith(TOKEN_TREASURY)
+                                .hasRetryPrecheckFrom(BUSY)
+                                // Verify that the top level status of the transaction is CONTRACT_REVERT_EXECUTED
+                                .hasKnownStatus(CONTRACT_REVERT_EXECUTED),
+                        getTxnRecord("associateCallcodeFungibleTxn")
                                 .andAllChildRecords()
                                 .logged())))
                 .then(
                         emptyChildRecordsCheck("associateStaticcallFungibleTxn", CONTRACT_REVERT_EXECUTED),
+                        emptyChildRecordsCheck("associateCallcodeFungibleTxn", CONTRACT_REVERT_EXECUTED),
                         getAccountInfo(ACCOUNT).hasNoTokenRelationship(FUNGIBLE_TOKEN));
     }
 

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/contract/precompile/ContractMintHTSV2SecurityModelSuite.java

@@ -16,6 +16,7 @@
 
 package com.hedera.services.bdd.suites.contract.precompile;
 
+import static com.hedera.services.bdd.junit.TestTags.SMART_CONTRACT;
 import static com.hedera.services.bdd.spec.HapiPropertySource.asToken;
 import static com.hedera.services.bdd.spec.HapiSpec.defaultHapiSpec;
 import static com.hedera.services.bdd.spec.assertions.TransactionRecordAsserts.recordWith;
@@ -65,8 +66,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Tag;
 
 @HapiTestSuite
+@Tag(SMART_CONTRACT)
 @SuppressWarnings("java:S1192") // "string literal should not be duplicated" - this rule makes test suites worse
 public class ContractMintHTSV2SecurityModelSuite extends HapiSuite {
 

platform-sdk/docs/core/wiring-diagram.svg

@@ -37,9 +37,6 @@
  *                                                          scheduler
  * @param internalEventValidator                            configuration for the internal event validator scheduler
  * @param eventDeduplicator                                 configuration for the event deduplicator scheduler
- * @param eventDeduplicatorSchedulerType                    the event deduplicator scheduler type
- * @param eventDeduplicatorUnhandledCapacity                number of unhandled tasks allowed in the event deduplicator
- *                                                          scheduler
  * @param eventSignatureValidatorSchedulerType              the event signature validator scheduler type
  * @param eventSignatureValidatorUnhandledCapacity          number of unhandled tasks allowed in the event signature
  *                                                          validator scheduler
@@ -100,8 +97,6 @@ public record PlatformSchedulersConfig(
                 TaskSchedulerConfiguration internalEventValidator,
         @ConfigProperty(defaultValue = "SEQUENTIAL CAPACITY(500) FLUSHABLE UNHANDLED_TASK_METRIC")
                 TaskSchedulerConfiguration eventDeduplicator,
-        @ConfigProperty(defaultValue = "SEQUENTIAL") TaskSchedulerType eventDeduplicatorSchedulerType,
-        @ConfigProperty(defaultValue = "500") int eventDeduplicatorUnhandledCapacity,
         @ConfigProperty(defaultValue = "SEQUENTIAL") TaskSchedulerType eventSignatureValidatorSchedulerType,
         @ConfigProperty(defaultValue = "500") int eventSignatureValidatorUnhandledCapacity,
         @ConfigProperty(defaultValue = "SEQUENTIAL") TaskSchedulerType orphanBufferSchedulerType,

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java

@@ -75,7 +75,7 @@ private StateSignatureCollectorWiring(
                 preConsensusTransformer = new WireTransformer<>(
                         model,
                         "extractPreconsensusSignatureTransactions",
-                        "preconsensus events",
+                        "preconsensus signatures",
                         event -> SystemTransactionExtractionUtils.extractFromEvent(
                                 event, StateSignatureTransaction.class));
         preConsensusEventInput = preConsensusTransformer.getInputWire();

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/StateSignatureCollectorWiring.java

@@ -21,8 +21,12 @@ pcli diagram \
     -s 'getKeystoneEventSequenceNumber:flush request:🚽' \
     -s 'extractOldestMinimumGenerationOnDisk:minimum identifier to store:📀' \
     -s 'eventCreationManager:non-validated events:🍎' \
-    -s 'Mystery Input:mystery data:X' \
+    -s 'Mystery Input:mystery data:❔' \
     -s 'stateSigner:signature transactions:🖋️' \
+    -s 'issNotificationSplitter:IssNotification:💥' \
+    -s 'toNotification:StateWriteToDiskCompleteNotification:📦' \
+    -s 'latestCompleteStateNotifier:CompleteStateNotificationWithCleanup:💢' \
+    -s 'orphanBufferSplitter:preconsensus signatures:🔰' \
     -g 'Event Validation:InternalEventValidator,EventDeduplicator,eventSignatureValidator' \
     -g 'Event Hashing:eventHasher,postHashCollector' \
     -g 'Orphan Buffer:orphanBuffer,orphanBufferSplitter' \
@@ -38,10 +42,10 @@ pcli diagram \
     -g 'Heartbeat:heartbeat,❤️' \
     -g 'PCES Replay:pcesReplayer,✅' \
     -g 'Transaction Prehandling:applicationTransactionPrehandler,🔮' \
-    -g 'Signature Management:State Signature Collection,stateSigner,🖋️' \
     -g 'Consensus Round Handler:consensusRoundHandler,postHandler_stateAndRoundReserver,postHandler_getRoundNumber,postHandler_stateReserver' \
     -g 'State Hasher:stateHasher,postHasher_stateAndRoundReserver,postHasher_getConsensusRound,postHasher_stateReserver' \
     -g 'State Modification:Consensus Round Handler,runningHashUpdate' \
+    -g 'State Verification:stateSigner,hashLogger,ISS Detector,🖋️,💥' \
     -c 'Consensus Event Stream' \
     -c 'Orphan Buffer' \
     -c 'Consensus Engine' \