From a7a28748cf7ee53a63773ea07326e0f7f7383b86 Mon Sep 17 00:00:00 2001 From: julia-zack Date: Mon, 13 Jan 2025 15:54:22 -0300 Subject: [PATCH 1/2] Increase mainnet svp validation period --- .../peg/federation/constants/FederationMainNetConstants.java | 2 +- .../rsk/peg/federation/constants/FederationConstantsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java index 66ddc6371e..7ea2a90217 100644 --- a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java +++ b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java @@ -42,7 +42,7 @@ private FederationMainNetConstants() { ).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).toList(); federationChangeAuthorizer = new AddressBasedAuthorizer(federationChangeAuthorizedKeys, AddressBasedAuthorizer.MinimumRequiredCalculation.MAJORITY); - validationPeriodDurationInBlocks = 16000L; + validationPeriodDurationInBlocks = 20000L; federationActivationAgeLegacy = 18500L; federationActivationAge = 40320L; 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 index d73051e3da..893a47c3bd 100644 --- 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 validationPeriodDurationArgs() { return Stream.of( - Arguments.of(MAINNET, 16000L), + Arguments.of(MAINNET, 20000L), Arguments.of(TESTNET, 2000L), Arguments.of(REGTEST, 125L) ); From 457134379c61d909482d07bdfe52d049ac48f759 Mon Sep 17 00:00:00 2001 From: julia-zack Date: Mon, 13 Jan 2025 16:07:58 -0300 Subject: [PATCH 2/2] Add underscore to improve readability --- .../federation/constants/FederationMainNetConstants.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java index 7ea2a90217..9c624e35eb 100644 --- a/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java +++ b/rskj-core/src/main/java/co/rsk/peg/federation/constants/FederationMainNetConstants.java @@ -42,13 +42,13 @@ private FederationMainNetConstants() { ).map(hex -> ECKey.fromPublicOnly(Hex.decode(hex))).toList(); federationChangeAuthorizer = new AddressBasedAuthorizer(federationChangeAuthorizedKeys, AddressBasedAuthorizer.MinimumRequiredCalculation.MAJORITY); - validationPeriodDurationInBlocks = 20000L; + validationPeriodDurationInBlocks = 20_000L; - federationActivationAgeLegacy = 18500L; - federationActivationAge = 40320L; + federationActivationAgeLegacy = 18_500L; + federationActivationAge = 40_320L; fundsMigrationAgeSinceActivationBegin = 0L; - fundsMigrationAgeSinceActivationEnd = 10585L; + fundsMigrationAgeSinceActivationEnd = 10_585L; specialCaseFundsMigrationAgeSinceActivationEnd = 172_800L; // 60 days, considering 1 block every 30 seconds erpFedPubKeysList = Stream.of(