chore: 21153 tss block signing threshold (#21629)

Signed-off-by: artemderevets <[email protected]>

Author: aderevets

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

@@ -41,7 +41,6 @@
 import com.hedera.node.app.state.ConsensusStateEventHandlerImpl;
 import com.hedera.node.app.tss.TssBlockHashSigner;
 import com.hedera.node.config.data.BlockStreamConfig;
-import com.hedera.node.config.data.TssConfig;
 import com.hedera.node.internal.network.Network;
 import com.hedera.node.internal.network.NodeMetadata;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
@@ -465,8 +464,7 @@ public static Hedera newHedera(
                         ForkJoinPool.commonPool(),
                         appContext,
                         new HintsLibraryImpl(),
-                        bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod(),
-                        bootstrapConfig.getConfigData(TssConfig.class)),
+                        bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod()),
                 (appContext, bootstrapConfig) -> new HistoryServiceImpl(
                         metrics, ForkJoinPool.commonPool(), appContext, new HistoryLibraryImpl(), bootstrapConfig),
                 TssBlockHashSigner::new,

hedera-node/hedera-app/src/main/java/com/hedera/node/app/hints/impl/HintsContext.java

@@ -11,6 +11,7 @@
 import com.hedera.node.app.hints.HintsLibrary;
 import com.hedera.node.config.data.TssConfig;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
+import com.swirlds.config.api.Configuration;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.time.Duration;
@@ -24,6 +25,7 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.logging.log4j.LogManager;
@@ -43,7 +45,7 @@ public class HintsContext {
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
 
     private final HintsLibrary library;
-    private final TssConfig tssConfig;
+    private final Supplier<Configuration> configProvider;
 
     @Nullable
     private Bytes crs;
@@ -57,9 +59,9 @@ public class HintsContext {
     private long schemeId;
 
     @Inject
-    public HintsContext(@NonNull final HintsLibrary library, @NonNull final TssConfig tssConfig) {
+    public HintsContext(@NonNull final HintsLibrary library, @NonNull final Supplier<Configuration> configProvider) {
         this.library = requireNonNull(library);
-        this.tssConfig = requireNonNull(tssConfig);
+        this.configProvider = requireNonNull(configProvider);
     }
 
     /**
@@ -177,6 +179,7 @@ public boolean validate(
             totalWeight += nodePartyId.partyWeight();
             nodeWeights.put(nodePartyId.nodeId(), nodePartyId.partyWeight());
         }
+        final var tssConfig = configProvider.get().getConfigData(TssConfig.class);
         final int divisor = tssConfig.signingThresholdDivisor();
         if (divisor <= 0) {
             throw new IllegalArgumentException("signingThresholdDivisor must be > 0");
@@ -284,9 +287,8 @@ public void incorporateValid(@NonNull final Bytes crs, final long nodeId, @NonNu
             signatures.put(partyId, signature);
             final var weight = nodeWeights.getOrDefault(nodeId, 0L);
             final var totalWeight = weightOfSignatures.addAndGet(weight);
-            final boolean reachedThreshold = tssConfig.strictSigningThreshold()
-                    ? (totalWeight > thresholdWeight)
-                    : (totalWeight >= thresholdWeight);
+            // For block hash signing, always require strictly greater than threshold
+            final boolean reachedThreshold = totalWeight > thresholdWeight;
             if (reachedThreshold && completed.compareAndSet(false, true)) {
                 final var aggregatedSignature =
                         library.aggregateSignatures(crs, aggregationKey, verificationKey, signatures);

hedera-node/hedera-app/src/main/java/com/hedera/node/app/hints/impl/HintsServiceComponent.java

@@ -5,7 +5,6 @@
 import com.hedera.node.app.hints.HintsLibrary;
 import com.hedera.node.app.hints.handlers.HintsHandlers;
 import com.hedera.node.app.spi.AppContext;
-import com.hedera.node.config.data.TssConfig;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.metrics.api.Metrics;
@@ -30,8 +29,7 @@ HintsServiceComponent create(
                 @BindsInstance Metrics metrics,
                 @BindsInstance AtomicReference<Roster> currentRoster,
                 @BindsInstance Duration blockPeriod,
-                @BindsInstance OnHintsFinished onHintsFinished,
-                @BindsInstance TssConfig tssConfig);
+                @BindsInstance OnHintsFinished onHintsFinished);
     }
 
     HintsHandlers handlers();

hedera-node/hedera-app/src/main/java/com/hedera/node/app/hints/impl/HintsServiceImpl.java

@@ -50,12 +50,11 @@ public HintsServiceImpl(
             @NonNull final Executor executor,
             @NonNull final AppContext appContext,
             @NonNull final HintsLibrary library,
-            @NonNull final Duration blockPeriod,
-            @NonNull final TssConfig tssConfig) {
+            @NonNull final Duration blockPeriod) {
         this.library = requireNonNull(library);
         // Fully qualified for benefit of javadoc
         this.component = com.hedera.node.app.hints.impl.DaggerHintsServiceComponent.factory()
-                .create(library, appContext, executor, metrics, currentRoster, blockPeriod, this, tssConfig);
+                .create(library, appContext, executor, metrics, currentRoster, blockPeriod, this);
     }
 
     @VisibleForTesting

hedera-node/hedera-app/src/main/java/com/hedera/node/app/workflows/standalone/TransactionExecutors.java

@@ -28,7 +28,6 @@
 import com.hedera.node.app.throttle.ThrottleAccumulator;
 import com.hedera.node.config.data.BlockStreamConfig;
 import com.hedera.node.config.data.HederaConfig;
-import com.hedera.node.config.data.TssConfig;
 import com.hedera.node.config.types.StreamMode;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.metrics.noop.NoOpMetrics;
@@ -291,8 +290,7 @@ private ExecutorComponent newExecutorComponent(
                 ForkJoinPool.commonPool(),
                 appContext,
                 new HintsLibraryImpl(),
-                bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod(),
-                bootstrapConfig.getConfigData(TssConfig.class));
+                bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod());
         final var historyService = new HistoryServiceImpl(
                 NO_OP_METRICS, ForkJoinPool.commonPool(), appContext, new HistoryLibraryImpl(), bootstrapConfig);
         final var component = DaggerExecutorComponent.builder()

hedera-node/hedera-app/src/test/java/com/hedera/node/app/components/IngestComponentTest.java

@@ -45,7 +45,6 @@
 import com.hedera.node.app.state.recordcache.RecordCacheService;
 import com.hedera.node.config.data.BlockStreamConfig;
 import com.hedera.node.config.data.HederaConfig;
-import com.hedera.node.config.data.TssConfig;
 import com.hedera.node.config.testfixtures.HederaTestConfigBuilder;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
 import com.swirlds.common.context.PlatformContext;
@@ -133,8 +132,7 @@ void setUp() {
                 ForkJoinPool.commonPool(),
                 appContext,
                 new HintsLibraryImpl(),
-                DEFAULT_CONFIG.getConfigData(BlockStreamConfig.class).blockPeriod(),
-                DEFAULT_CONFIG.getConfigData(TssConfig.class));
+                DEFAULT_CONFIG.getConfigData(BlockStreamConfig.class).blockPeriod());
         final var historyService = new HistoryServiceImpl(
                 NO_OP_METRICS, ForkJoinPool.commonPool(), appContext, new HistoryLibraryImpl(), DEFAULT_CONFIG);
         app = DaggerHederaInjectionComponent.builder()

hedera-node/hedera-app/src/test/java/com/hedera/node/app/hints/impl/HintsContextTest.java

@@ -3,6 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.lenient;
 
 import com.hedera.hapi.node.state.hints.HintsConstruction;
 import com.hedera.hapi.node.state.hints.HintsScheme;
@@ -11,9 +12,11 @@
 import com.hedera.node.app.hints.HintsLibrary;
 import com.hedera.node.config.data.TssConfig;
 import com.hedera.pbj.runtime.io.buffer.Bytes;
+import com.swirlds.config.api.Configuration;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,18 +46,22 @@ class HintsContextTest {
     @Mock
     private Bytes signature;
 
-    private HintsContext subject;
+    @Mock
+    private Supplier<Configuration> configProvider;
 
     @Mock
-    private TssConfig strictHalfConfig;
+    private Configuration configuration;
+
+    private HintsContext subject;
 
     @BeforeEach
     void setUp() {
-        strictHalfConfig = defaultConfig(2, true);
-        subject = new HintsContext(library, strictHalfConfig);
+        lenient().when(configProvider.get()).thenReturn(configuration);
+        lenient().when(configuration.getConfigData(TssConfig.class)).thenReturn(defaultConfig(2));
+        subject = new HintsContext(library, configProvider);
     }
 
-    private static TssConfig defaultConfig(final int divisor, final boolean strict) {
+    private static TssConfig defaultConfig(final int divisor) {
         return new TssConfig(
                 Duration.ofSeconds(60),
                 Duration.ofSeconds(300),
@@ -67,8 +74,7 @@ private static TssConfig defaultConfig(final int divisor, final boolean strict)
                 false,
                 false,
                 false,
-                divisor,
-                strict);
+                divisor);
     }
 
     @Test
@@ -113,33 +119,7 @@ void incorporatingValidWorksAsExpected() {
     }
 
     @Test
-    void greaterOrEqualComparisonAllowsExactThreshold() {
-        final var equalWeightA = new NodePartyId(11L, 1, 5L);
-        final var equalWeightB = new NodePartyId(12L, 2, 5L);
-        final var equalConstruction = HintsConstruction.newBuilder()
-                .constructionId(2L)
-                .hintsScheme(new HintsScheme(PREPROCESSED_KEYS, List.of(equalWeightA, equalWeightB)))
-                .build();
-
-        final Map<Integer, Bytes> expectedSignatures = Map.of(equalWeightA.partyId(), signature);
-        final var aggregateSignature = Bytes.wrap("AS2");
-        given(library.aggregateSignatures(CRS, AGGREGATION_KEY, VERIFICATION_KEY, expectedSignatures))
-                .willReturn(aggregateSignature);
-
-        final var geConfig = defaultConfig(2, false);
-        final var geSubject = new HintsContext(library, geConfig);
-        geSubject.setConstruction(equalConstruction);
-
-        final var signing = geSubject.newSigning(BLOCK_HASH, () -> {});
-        final var future = signing.future();
-
-        signing.incorporateValid(CRS, equalWeightA.nodeId(), signature);
-        assertTrue(future.isDone());
-        assertEquals(aggregateSignature, future.join());
-    }
-
-    @Test
-    void strictComparisonRequiresGreaterThanThreshold() {
+    void alwaysRequiresGreaterThanThreshold() {
         final var a = new NodePartyId(21L, 1, 5L);
         final var b = new NodePartyId(22L, 2, 5L);
         final var construction = HintsConstruction.newBuilder()
@@ -152,18 +132,16 @@ void strictComparisonRequiresGreaterThanThreshold() {
         given(library.aggregateSignatures(CRS, AGGREGATION_KEY, VERIFICATION_KEY, expectedSignatures))
                 .willReturn(aggregateSignature);
 
-        final var strictConfig = defaultConfig(2, true);
-        final var s = new HintsContext(library, strictConfig);
-        s.setConstruction(construction);
+        subject.setConstruction(construction);
 
-        final var signing = s.newSigning(BLOCK_HASH, () -> {});
+        final var signing = subject.newSigning(BLOCK_HASH, () -> {});
         final var future = signing.future();
 
-        // Exactly half: should NOT complete when strict
+        // Exactly half (5 out of 10 total weight): should NOT complete, need strictly > 1/2
         signing.incorporateValid(CRS, a.nodeId(), signature);
         assertFalse(future.isDone());
 
-        // One more: now it should complete
+        // One more signature gives us 10 out of 10: now it should complete
         signing.incorporateValid(CRS, b.nodeId(), signature);
         assertTrue(future.isDone());
         assertEquals(aggregateSignature, future.join());

hedera-node/hedera-app/src/test/java/com/hedera/node/app/hints/impl/WritableHintsStoreImplTest.java

@@ -124,6 +124,7 @@ class WritableHintsStoreImplTest {
 
     @BeforeEach
     void setUp() {
+        given(appContext.configSupplier()).willReturn(() -> DEFAULT_CONFIG);
         state = emptyState();
         entityCounters = new WritableEntityIdStore(new MapWritableStates(Map.of(
                 ENTITY_ID_STATE_ID,
@@ -472,8 +473,7 @@ private State emptyState() {
                                 library,
                                 DEFAULT_CONFIG
                                         .getConfigData(BlockStreamConfig.class)
-                                        .blockPeriod(),
-                                DEFAULT_CONFIG.getConfigData(TssConfig.class)))
+                                        .blockPeriod()))
                 .forEach(servicesRegistry::register);
         final var migrator = new FakeServiceMigrator();
         final var bootstrapConfig = new BootstrapConfigProviderImpl().getConfiguration();

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

@@ -27,6 +27,5 @@ public record TssConfig(
         // to give express consent for breaking the address book chain of trust
         @ConfigProperty(defaultValue = "false") @NetworkProperty boolean forceHandoffs,
         // Denominator used to compute signing threshold: totalWeight / signingThresholdDivisor
-        @ConfigProperty(defaultValue = "2") @Min(1) @NetworkProperty int signingThresholdDivisor,
-        // If true, require strictly greater than threshold; if false, allow greater-than-or-equal
-        @ConfigProperty(defaultValue = "true") @NetworkProperty boolean strictSigningThreshold) {}
+        // For block hash signing, this must always be 2 to ensure > 1/2 consensus
+        @ConfigProperty(defaultValue = "2") @Min(1) @NetworkProperty int signingThresholdDivisor) {}

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/hedera/embedded/fakes/FakeHintsService.java

@@ -33,8 +33,7 @@ public FakeHintsService(@NonNull final AppContext appContext, @NonNull final Con
                 pendingHintsSubmissions::offer,
                 appContext,
                 new HintsLibraryImpl(),
-                bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod(),
-                bootstrapConfig.getConfigData(TssConfig.class));
+                bootstrapConfig.getConfigData(BlockStreamConfig.class).blockPeriod());
     }
 
     @Override