refactor: remove the RSKIP643 pegout tx index grace period

rskj-core/src/main/java/co/rsk/peg/PegUtils.java

@@ -44,7 +44,7 @@ static PegTxType getTransactionTypeUsingPegoutIndex(
         List<TransactionOutput> liveFederationOutputs = btcTransaction.getWalletOutputs(liveFederationsWallet);
 
         Optional<Sha256Hash> inputSigHash = BitcoinUtils.getSigHashForPegoutIndex(btcTransaction);
-        if (inputSigHash.isPresent() && provider.hasPegoutTxSigHash(inputSigHash.get())){
+        if (inputSigHash.isPresent() && provider.hasPegoutTxSigHash(inputSigHash.get())) {
             return PegTxType.PEGOUT_OR_MIGRATION;
         } else if (!liveFederationOutputs.isEmpty()){
             return PegTxType.PEGIN;
@@ -143,18 +143,6 @@ private static boolean isPegoutTxIndexEnabled(
             btcTransactionHeight >= heightAtWhichToStartUsingPegoutIndex;
     }
 
-    private static boolean isFederationsPendingBtcUTXOsEnabled(
-        BridgeConstants bridgeConstants,
-        ActivationConfig.ForBlock activations,
-        long btcTransactionHeight
-    ) {
-        int btcHeightWhenFederationsPendingBtcUTXOsActivates = bridgeConstants.getBtcHeightWhenFederationsPendingBtcUTXOsActivates();
-        int gracePeriodInBtcBlocks = bridgeConstants.getPegoutTxIndexGracePeriodInBtcBlocks();
-        int heightAtWhichToStartUsingFederationsPendingBtcUTXOs = btcHeightWhenFederationsPendingBtcUTXOsActivates + gracePeriodInBtcBlocks;
-        return activations.isActive(ConsensusRule.RSKIP643) &&
-            btcTransactionHeight >= heightAtWhichToStartUsingFederationsPendingBtcUTXOs;
-    }
-
     private static boolean isTheSvpFundTransaction(
         BridgeStorageProvider provider,
         ActivationConfig.ForBlock activations,

rskj-core/src/main/java/co/rsk/peg/constants/BridgeConstants.java

@@ -72,7 +72,6 @@ public abstract class BridgeConstants {
 
     protected int btcHeightWhenPegoutTxIndexActivates;
     protected int pegoutTxIndexGracePeriodInBtcBlocks;
-    protected int btcHeightWhenFederationsPendingBtcUTXOsActivates;
     protected int blockWithTooMuchChainWorkHeight;
 
     public NetworkParameters getBtcParams() {
@@ -154,9 +153,5 @@ public int getPegoutTxIndexGracePeriodInBtcBlocks() {
         return pegoutTxIndexGracePeriodInBtcBlocks;
     }
 
-    public int getBtcHeightWhenFederationsPendingBtcUTXOsActivates() {
-        return btcHeightWhenFederationsPendingBtcUTXOsActivates;
-    }
-
     public int getBlockWithTooMuchChainWorkHeight() { return blockWithTooMuchChainWorkHeight; }
 }

rskj-core/src/main/java/co/rsk/peg/constants/BridgeMainNetConstants.java

@@ -48,8 +48,6 @@ private BridgeMainNetConstants() {
 
         btcHeightWhenPegoutTxIndexActivates = 837_589; // Estimated date Wed, 03 Apr 2024 15:00:00 GMT. 832,430 was the block number at time of calculation
         pegoutTxIndexGracePeriodInBtcBlocks = THIRTY_DAYS_IN_BTC_BLOCKS;
-        // TODO: estimate the BTC height for the RSKIP643 activation date once it is scheduled
-        btcHeightWhenFederationsPendingBtcUTXOsActivates = 10_000_000;
 
         blockWithTooMuchChainWorkHeight = 849_138;
     }

rskj-core/src/main/java/co/rsk/peg/constants/BridgeRegTestConstants.java

@@ -83,8 +83,6 @@ public BridgeRegTestConstants(List<BtcECKey> federationPublicKeys) {
 
         btcHeightWhenPegoutTxIndexActivates = 250;
         pegoutTxIndexGracePeriodInBtcBlocks = 100;
-        // TODO: estimate the BTC height for the RSKIP643 activation date once it is scheduled
-        btcHeightWhenFederationsPendingBtcUTXOsActivates = btcHeightWhenPegoutTxIndexActivates + 10;
 
         blockWithTooMuchChainWorkHeight = Integer.MAX_VALUE;
     }

rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNet2Constants.java

@@ -73,8 +73,6 @@ public class BridgeTestNet2Constants extends BridgeConstants {
         // Pegout tx index active since genesis
         btcHeightWhenPegoutTxIndexActivates = 0;
         pegoutTxIndexGracePeriodInBtcBlocks = 0;
-        // TODO: estimate the BTC height for the RSKIP643 activation date once it is scheduled
-        btcHeightWhenFederationsPendingBtcUTXOsActivates = 10_000_000;
 
         blockWithTooMuchChainWorkHeight = Integer.MAX_VALUE;
     }

rskj-core/src/main/java/co/rsk/peg/constants/BridgeTestNetConstants.java

@@ -66,8 +66,6 @@ public class BridgeTestNetConstants extends BridgeConstants {
 
         btcHeightWhenPegoutTxIndexActivates = 2_589_553; // Estimated date Wed, 20 Mar 2024 15:00:00 GMT. 2,579,823 was the block number at time of calculation
         pegoutTxIndexGracePeriodInBtcBlocks = 1_440; // 10 days in BTC blocks (considering 1 block every 10 minutes)
-        // TODO: estimate the BTC height for the RSKIP643 activation date once it is scheduled
-        btcHeightWhenFederationsPendingBtcUTXOsActivates = 10_000_000;
 
         blockWithTooMuchChainWorkHeight = Integer.MAX_VALUE;
     }

rskj-core/src/test/java/co/rsk/peg/PegUtilsGetTransactionTypeTest.java

@@ -39,6 +39,8 @@
 import co.rsk.peg.federation.constants.FederationConstants;
 import co.rsk.peg.storage.InMemoryStorage;
 import co.rsk.peg.storage.StorageAccessor;
+import co.rsk.test.builders.MigrationTransactionBuilder;
+import co.rsk.test.builders.PegoutTransactionBuilder;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;