Update testnet validation period duration and activation age

rsksmart · Dec 23, 2024 · 163b160 · 163b160
1 parent 34a0910
commit 163b160
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationConstants.java b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationConstants.java
@@ -40,7 +40,24 @@ public Instant getGenesisFederationCreationTime() {
     public long getValidationPeriodDurationInBlocks() { return validationPeriodDurationInBlocks; }
 
     public long getFederationActivationAge(ActivationConfig.ForBlock activations) {
-        return activations.isActive(ConsensusRule.RSKIP383) ? federationActivationAge  : federationActivationAgeLegacy;
+        if (!activations.isActive(ConsensusRule.RSKIP383)) {
+            return federationActivationAgeLegacy;
+        }
+
+        if (btcParams.equals(NetworkParameters.fromID(NetworkParameters.ID_TESTNET))) {
+            return getTestnetFederationActivationAge(activations);
+        }
+        return federationActivationAge;
+    }
+
+    private long getTestnetFederationActivationAge(ActivationConfig.ForBlock activations) {
+        if (!activations.isActive(ConsensusRule.RSKIP419)) {
+            return federationActivationAge;
+        }
+
+        // after lovell, we have to consider the activation age
+        // has to be at least the validation period duration
+        return validationPeriodDurationInBlocks;
     }
 
     public long getFundsMigrationAgeSinceActivationBegin() {

diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationTestNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationTestNetConstants.java
@@ -35,7 +35,7 @@ private FederationTestNetConstants() {
         ).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).collect(Collectors.toList()));
         federationChangeAuthorizer = new AddressBasedAuthorizer(federationChangeAuthorizedKeys, AddressBasedAuthorizer.MinimumRequiredCalculation.MAJORITY);
 
-        validationPeriodDurationInBlocks = 80L;
+        validationPeriodDurationInBlocks = 2000L;
 
         federationActivationAgeLegacy = 60L;
         federationActivationAge = 120L;

diff --git a/rskj-core/src/test/java/co/rsk/peg/federation/constants/FederationConstantsTest.java b/rskj-core/src/test/java/co/rsk/peg/federation/constants/FederationConstantsTest.java
@@ -115,7 +115,7 @@ void getValidationPeriodDuration(FederationConstants constants, long expectedDur
     private static Stream<Arguments> validationPeriodDurationArgs() {
         return Stream.of(
             Arguments.of(MAINNET, 16000L),
-            Arguments.of(TESTNET, 80L),
+            Arguments.of(TESTNET, 2000L),
             Arguments.of(REGTEST, 125L)
         );
     }