refactor: remove the RSKIP643 pegout tx index grace period

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

@@ -34,17 +34,24 @@ private PegUtils() { }
     static PegTxType getTransactionTypeUsingPegoutIndex(
         ActivationConfig.ForBlock activations,
         BridgeStorageProvider provider,
+        BridgeConstants bridgeConstants,
         Wallet liveFederationsWallet,
-        BtcTransaction btcTransaction
+        BtcTransaction btcTransaction,
+        long btcTransactionHeight
     ) {
         if (!activations.isActive(ConsensusRule.RSKIP379)) {
             throw new IllegalStateException("Can't call this method before RSKIP379 activation");
         }
 
         List<TransactionOutput> liveFederationOutputs = btcTransaction.getWalletOutputs(liveFederationsWallet);
 
-        Optional<Sha256Hash> inputSigHash = BitcoinUtils.getSigHashForPegoutIndex(btcTransaction);
-        if (inputSigHash.isPresent() && provider.hasPegoutTxSigHash(inputSigHash.get())){
+        if (isIdentifiedByPegoutIndex(
+            provider,
+            bridgeConstants,
+            activations,
+            btcTransaction,
+            btcTransactionHeight
+        )) {
             return PegTxType.PEGOUT_OR_MIGRATION;
         } else if (!liveFederationOutputs.isEmpty()){
             return PegTxType.PEGIN;
@@ -53,6 +60,22 @@ static PegTxType getTransactionTypeUsingPegoutIndex(
         }
     }
 
+    private static boolean isIdentifiedByPegoutIndex(
+        BridgeStorageProvider provider,
+        BridgeConstants bridgeConstants,
+        ActivationConfig.ForBlock activations,
+        BtcTransaction btcTransaction,
+        long btcTransactionHeight
+    ) {
+        // Once the grace period ends, releases are only identified by their federations pending btc utxos
+        if (isFederationsPendingBtcUTXOsEnabled(bridgeConstants, activations, btcTransactionHeight)) {
+            return false;
+        }
+        return BitcoinUtils.getSigHashForPegoutIndex(btcTransaction)
+            .map(provider::hasPegoutTxSigHash)
+            .orElse(false);
+    }
+
     /**
      * Checks if all utxos sent to the <b>fedWallet</b> are equal or above the minimum pegin value.
      * If no utxo is sent to the <b>fedWallet </b>or there is at least 1 utxo sent to the <b>fedWallet</b> that is below minimum,
@@ -126,8 +149,10 @@ static PegTxType getTransactionType(
         return getTransactionTypeUsingPegoutIndex(
             activations,
             provider,
+            bridgeConstants,
             liveFederationsWallet,
-            btcTransaction
+            btcTransaction,
+            btcTransactionHeight
         );
     }