Merge pull request #2037 from rsksmart/increase-migration-activation-…

…integration Increase migration activation integration
rsksmart · May 12, 2023 · e91cbec · e91cbec
2 parents 8eb2a79 + cccfc25
commit e91cbec
Show file tree

Hide file tree

Showing 26 changed files with 301 additions and 213 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeConstants.java
@@ -46,6 +46,7 @@ public abstract class BridgeConstants {
     protected Coin minimumPegoutTxValueInSatoshis;
 
     protected long federationActivationAge;
+    protected long federationActivationAgeLegacy;
 
     protected long fundsMigrationAgeSinceActivationBegin;
     protected long fundsMigrationAgeSinceActivationEnd;
@@ -119,8 +120,8 @@ public int getRsk2BtcMinimumAcceptableConfirmations() {
 
     public Coin getMinimumPegoutTxValueInSatoshis() { return minimumPegoutTxValueInSatoshis; }
 
-    public long getFederationActivationAge() {
-        return federationActivationAge;
+    public long getFederationActivationAge(ActivationConfig.ForBlock activations) {
+        return activations.isActive(ConsensusRule.RSKIP383)? federationActivationAge: federationActivationAgeLegacy;
     }
 
     public long getFundsMigrationAgeSinceActivationBegin() {

diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeDevNetConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeDevNetConstants.java
@@ -104,7 +104,8 @@ public BridgeDevNetConstants(List<BtcECKey> federationPublicKeys) {
             AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
         );
 
-        federationActivationAge = 10L;
+        federationActivationAgeLegacy = 10L;
+        federationActivationAge = 20L;
 
         fundsMigrationAgeSinceActivationBegin = 15L;
         fundsMigrationAgeSinceActivationEnd = 100L;

diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeMainNetConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeMainNetConstants.java
@@ -93,7 +93,8 @@ public class BridgeMainNetConstants extends BridgeConstants {
             AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
         );
 
-        federationActivationAge = 18500L;
+        federationActivationAgeLegacy = 18500L;
+        federationActivationAge = 40320L;
 
         fundsMigrationAgeSinceActivationBegin = 0L;
         fundsMigrationAgeSinceActivationEnd = 10585L;

diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeRegTestConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeRegTestConstants.java
@@ -90,7 +90,8 @@ public BridgeRegTestConstants(List<BtcECKey> federationPublicKeys) {
             AddressBasedAuthorizer.MinimumRequiredCalculation.MAJORITY
         );
 
-        federationActivationAge = 10L;
+        federationActivationAgeLegacy = 10L;
+        federationActivationAge = 20L;
 
         fundsMigrationAgeSinceActivationBegin = 15L;
         fundsMigrationAgeSinceActivationEnd = 150L;

diff --git a/rskj-core/src/main/java/co/rsk/config/BridgeTestNetConstants.java b/rskj-core/src/main/java/co/rsk/config/BridgeTestNetConstants.java
@@ -103,7 +103,8 @@ public class BridgeTestNetConstants extends BridgeConstants {
             AddressBasedAuthorizer.MinimumRequiredCalculation.ONE
         );
 
-        federationActivationAge = 60L;
+        federationActivationAgeLegacy = 60L;
+        federationActivationAge = 120L;
 
         fundsMigrationAgeSinceActivationBegin = 60L;
         fundsMigrationAgeSinceActivationEnd = 900L;

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -998,7 +998,7 @@ private void processFundsMigration(Transaction rskTx) throws IOException {
     }
 
     private boolean federationIsInMigrationAge(Federation federation) {
-        long federationActivationAge = bridgeConstants.getFederationActivationAge();
+        long federationActivationAge = bridgeConstants.getFederationActivationAge(activations);
         long federationAge = rskExecutionBlock.getNumber() - federation.getCreationBlockNumber();
         long ageBegin = federationActivationAge + bridgeConstants.getFundsMigrationAgeSinceActivationBegin();
         long ageEnd = federationActivationAge + bridgeConstants.getFundsMigrationAgeSinceActivationEnd(activations);
@@ -1008,7 +1008,7 @@ private boolean federationIsInMigrationAge(Federation federation) {
 
     private boolean federationIsPastMigrationAge(Federation federation) {
         long federationAge = rskExecutionBlock.getNumber() - federation.getCreationBlockNumber();
-        long ageEnd = bridgeConstants.getFederationActivationAge() +
+        long ageEnd = bridgeConstants.getFederationActivationAge(activations) +
             bridgeConstants.getFundsMigrationAgeSinceActivationEnd(activations);
 
         return federationAge >= ageEnd;
@@ -1327,7 +1327,7 @@ private void updateFederationCreationBlockHeights() {
             long nextFederationCreationBlockHeight = nextFederationCreationBlockHeightOpt.get();
             long curBlockHeight = rskExecutionBlock.getNumber();
 
-            if (curBlockHeight >= nextFederationCreationBlockHeight + bridgeConstants.getFederationActivationAge()) {
+            if (curBlockHeight >= nextFederationCreationBlockHeight + bridgeConstants.getFederationActivationAge(activations)) {
                 provider.setActiveFederationCreationBlockHeight(nextFederationCreationBlockHeight);
                 provider.clearNextFederationCreationBlockHeight();
             }
@@ -2678,7 +2678,7 @@ public long getActiveFederationCreationBlockHeight() {
         if (nextFederationCreationBlockHeightOpt.isPresent()) {
             long nextFederationCreationBlockHeight = nextFederationCreationBlockHeightOpt.get();
             long curBlockHeight = rskExecutionBlock.getNumber();
-            if (curBlockHeight >= nextFederationCreationBlockHeight + bridgeConstants.getFederationActivationAge()) {
+            if (curBlockHeight >= nextFederationCreationBlockHeight + bridgeConstants.getFederationActivationAge(activations)) {
                 return nextFederationCreationBlockHeight;
             }
         }

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupportFactory.java
@@ -67,7 +67,7 @@ public BridgeSupport newInstance(Repository repository, Block executionBlock,
             activations
         );
 
-        FederationSupport federationSupport = new FederationSupport(bridgeConstants, provider, executionBlock);
+        FederationSupport federationSupport = new FederationSupport(bridgeConstants, provider, executionBlock, activations);
 
         BridgeEventLogger eventLogger;
         if (logs == null) {

diff --git a/rskj-core/src/main/java/co/rsk/peg/FederationSupport.java b/rskj-core/src/main/java/co/rsk/peg/FederationSupport.java
@@ -20,6 +20,7 @@
 import co.rsk.bitcoinj.core.BtcECKey;
 import co.rsk.bitcoinj.core.UTXO;
 import co.rsk.config.BridgeConstants;
+import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.Block;
 
 import javax.annotation.Nullable;
@@ -34,11 +35,13 @@ private enum StorageFederationReference { NONE, NEW, OLD, GENESIS }
     private final BridgeStorageProvider provider;
     private final BridgeConstants bridgeConstants;
     private final Block executionBlock;
+    private final ActivationConfig.ForBlock activations;
 
-    public FederationSupport(BridgeConstants bridgeConstants, BridgeStorageProvider provider, Block executionBlock) {
+    public FederationSupport(BridgeConstants bridgeConstants, BridgeStorageProvider provider, Block executionBlock, ActivationConfig.ForBlock activations) {
         this.provider = provider;
         this.bridgeConstants = bridgeConstants;
         this.executionBlock = executionBlock;
+        this.activations = activations;
     }
 
     /**
@@ -226,6 +229,6 @@ private StorageFederationReference getRetiringFederationReference() {
 
     private boolean shouldFederationBeActive(Federation federation) {
         long federationAge = executionBlock.getNumber() - federation.getCreationBlockNumber();
-        return federationAge >= bridgeConstants.getFederationActivationAge();
+        return federationAge >= bridgeConstants.getFederationActivationAge(activations);
     }
 }
diff --git a/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java b/rskj-core/src/main/java/co/rsk/peg/utils/BridgeEventLoggerImpl.java
@@ -106,7 +106,7 @@ public void logCommitFederation(Block executionBlock, Federation oldFederation,
         String oldFederationBtcAddress = oldFederation.getAddress().toBase58();
         byte[] newFederationFlatPubKeys = flatKeysAsByteArray(newFederation.getBtcPublicKeys());
         String newFederationBtcAddress = newFederation.getAddress().toBase58();
-        long newFedActivationBlockNumber = executionBlock.getNumber() + this.bridgeConstants.getFederationActivationAge();
+        long newFedActivationBlockNumber = executionBlock.getNumber() + this.bridgeConstants.getFederationActivationAge(activations);
 
         CallTransaction.Function event = BridgeEvents.COMMIT_FEDERATION.getEvent();
         byte[][] encodedTopicsInBytes = event.encodeEventTopics();

diff --git a/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java b/rskj-core/src/main/java/co/rsk/peg/utils/BrigeEventLoggerLegacyImpl.java
@@ -119,7 +119,7 @@ public void logCommitFederation(Block executionBlock, Federation oldFederation,
         byte[] newFedFlatPubKeys = flatKeysAsRlpCollection(newFederation.getBtcPublicKeys());
         byte[] newFedData = RLP.encodeList(RLP.encodeElement(newFederation.getAddress().getHash160()), RLP.encodeList(newFedFlatPubKeys));
 
-        long newFedActivationBlockNumber = executionBlock.getNumber() + this.bridgeConstants.getFederationActivationAge();
+        long newFedActivationBlockNumber = executionBlock.getNumber() + this.bridgeConstants.getFederationActivationAge(activations);
 
         byte[] data = RLP.encodeList(oldFedData, newFedData, RLP.encodeString(Long.toString(newFedActivationBlockNumber)));
 

diff --git a/rskj-core/src/main/java/co/rsk/remasc/RemascFederationProvider.java b/rskj-core/src/main/java/co/rsk/remasc/RemascFederationProvider.java
@@ -38,13 +38,15 @@ public RemascFederationProvider(
             BridgeConstants bridgeConstants,
             Repository repository,
             Block processingBlock) {
+
+        ActivationConfig.ForBlock activations = activationConfig.forBlock(processingBlock.getNumber());
         BridgeStorageProvider bridgeStorageProvider = new BridgeStorageProvider(
                 repository,
                 PrecompiledContracts.BRIDGE_ADDR,
                 bridgeConstants,
-                activationConfig.forBlock(processingBlock.getNumber())
+                activations
         );
-        this.federationSupport = new FederationSupport(bridgeConstants, bridgeStorageProvider, processingBlock);
+        this.federationSupport = new FederationSupport(bridgeConstants, bridgeStorageProvider, processingBlock, activations);
     }
 
     public int getFederationSize() {

diff --git a/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java b/rskj-core/src/main/java/org/ethereum/config/blockchain/upgrades/ConsensusRule.java
@@ -83,6 +83,7 @@ public enum ConsensusRule {
     RSKIP374("rskip374"),
     RSKIP375("rskip375"),
     RSKIP377("rskip377"),
+    RSKIP383("rskip383"),
     RSKIP385("rskip385"),
     ;
 

diff --git a/rskj-core/src/main/resources/expected.conf b/rskj-core/src/main/resources/expected.conf
@@ -81,6 +81,7 @@ blockchain = {
              rskip374 = <hardforkName>
              rskip375 = <hardforkName>
              rskip377 = <hardforkName>
+             rskip383 = <hardforkName>
              rskip385 = <hardforkName>
          }
     }

diff --git a/rskj-core/src/main/resources/reference.conf b/rskj-core/src/main/resources/reference.conf
@@ -69,6 +69,7 @@ blockchain = {
             rskip374 = fingerroot500
             rskip375 = fingerroot500
             rskip377 = fingerroot500
+            rskip383 = fingerroot500
             rskip385 = fingerroot500
         }
     }

diff --git a/rskj-core/src/test/java/co/rsk/config/BridgeConstantsTest.java b/rskj-core/src/test/java/co/rsk/config/BridgeConstantsTest.java
@@ -13,8 +13,7 @@
 import static org.mockito.Mockito.when;
 
 class BridgeConstantsTest {
-
-    private static Stream<Arguments> generator() {
+    private static Stream<Arguments> fundsMigrationAgeSinceActivationEndArgsProvider() {
         return Stream.of(
             Arguments.of(BridgeMainNetConstants.getInstance(), false),
             Arguments.of(BridgeTestNetConstants.getInstance(), true),
@@ -23,8 +22,8 @@ private static Stream<Arguments> generator() {
     }
 
     @ParameterizedTest()
-    @MethodSource("generator")
-    void test_getFundsMigrationAgeSinceActivationEnd(BridgeConstants bridgeConstants, boolean hasSameValueForBothMigrationAges) {
+    @MethodSource("fundsMigrationAgeSinceActivationEndArgsProvider")
+    void test_getFundsMigrationAgeSinceActivationEnd(BridgeConstants bridgeConstants, boolean hasSameValueForBothFields) {
         // Arrange
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
 
@@ -33,11 +32,11 @@ void test_getFundsMigrationAgeSinceActivationEnd(BridgeConstants bridgeConstants
 
         // assert
         assertEquals(fundsMigrationAgeSinceActivationEnd, bridgeConstants.fundsMigrationAgeSinceActivationEnd);
-        assertEquals(hasSameValueForBothMigrationAges,  fundsMigrationAgeSinceActivationEnd == bridgeConstants.specialCaseFundsMigrationAgeSinceActivationEnd);
+        assertEquals(hasSameValueForBothFields,  fundsMigrationAgeSinceActivationEnd == bridgeConstants.specialCaseFundsMigrationAgeSinceActivationEnd);
     }
 
     @ParameterizedTest()
-    @MethodSource("generator")
+    @MethodSource("fundsMigrationAgeSinceActivationEndArgsProvider")
     void test_getFundsMigrationAgeSinceActivationEnd_post_RSKIP357(BridgeConstants bridgeConstants, boolean hasSameValueForBothMigrationAges) {
         // Arrange
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
@@ -52,7 +51,7 @@ void test_getFundsMigrationAgeSinceActivationEnd_post_RSKIP357(BridgeConstants b
     }
 
     @ParameterizedTest()
-    @MethodSource("generator")
+    @MethodSource("fundsMigrationAgeSinceActivationEndArgsProvider")
     void test_getFundsMigrationAgeSinceActivationEnd_post_RSKIP374(BridgeConstants bridgeConstants, boolean hasSameValueForBothMigrationAges) {
         // Arrange
         ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
@@ -66,4 +65,32 @@ void test_getFundsMigrationAgeSinceActivationEnd_post_RSKIP374(BridgeConstants b
         assertEquals(fundsMigrationAgeSinceActivationEnd, bridgeConstants.fundsMigrationAgeSinceActivationEnd);
         assertEquals(hasSameValueForBothMigrationAges,  fundsMigrationAgeSinceActivationEnd == bridgeConstants.specialCaseFundsMigrationAgeSinceActivationEnd);
     }
+
+    private static Stream<Arguments> federationActivationAgeArgProvider() {
+        return Stream.of(
+            Arguments.of(BridgeMainNetConstants.getInstance(), false),
+            Arguments.of(BridgeTestNetConstants.getInstance(), false),
+            Arguments.of(BridgeRegTestConstants.getInstance(), false),
+            Arguments.of(BridgeMainNetConstants.getInstance(), true),
+            Arguments.of(BridgeTestNetConstants.getInstance(), true),
+            Arguments.of(BridgeRegTestConstants.getInstance(), true)
+        );
+    }
+
+    @ParameterizedTest()
+    @MethodSource("federationActivationAgeArgProvider")
+    void test_getFederationActivationAge(BridgeConstants bridgeConstants, boolean isRSKIP383Active) {
+        // Arrange
+        ActivationConfig.ForBlock activations = mock(ActivationConfig.ForBlock.class);
+        when(activations.isActive(ConsensusRule.RSKIP383)).thenReturn(isRSKIP383Active);
+        // Act
+        long federationActivationAge = bridgeConstants.getFederationActivationAge(activations);
+
+        // assert
+        if (isRSKIP383Active){
+            assertEquals(bridgeConstants.federationActivationAge, federationActivationAge);
+        } else {
+            assertEquals(bridgeConstants.federationActivationAgeLegacy, federationActivationAge);
+        }
+    }
 }