From 3513c98d8d5b9dd83e55ff3fd5ad77e471fc1f9f Mon Sep 17 00:00:00 2001
From: julia-zack <julia.zack@iovlabs.org>
Date: Tue, 19 Nov 2024 13:58:52 -0300
Subject: [PATCH 1/4] Modify public method to remove signatures for just
 returning the hash without them.

---
 .../java/co/rsk/peg/bitcoin/BitcoinUtils.java | 14 +++++++-
 .../co/rsk/peg/bitcoin/BitcoinUtilsTest.java  | 33 ++++++++++---------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java b/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
index aee24d3fdb..747625b72e 100644
--- a/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
+++ b/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
@@ -57,7 +57,19 @@ public static Optional<Script> extractRedeemScriptFromInput(TransactionInput txI
         }
     }
 
-    public static void removeSignaturesFromTransactionWithP2shMultiSigInputs(BtcTransaction transaction) {
+    public static Sha256Hash getMultiSigTransactionHashWithoutSignatures(NetworkParameters networkParameters, BtcTransaction transaction) {
+        Sha256Hash transactionHash = transaction.getHash();
+
+        if (!transaction.hasWitness()) {
+            BtcTransaction transactionCopyWithoutSignatures = new BtcTransaction(networkParameters, transaction.bitcoinSerialize()); // this is needed to not remove signatures from the actual tx
+            BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transactionCopyWithoutSignatures);
+            transactionHash = transactionCopyWithoutSignatures.getHash();
+        }
+
+        return transactionHash;
+    }
+
+    private static void removeSignaturesFromTransactionWithP2shMultiSigInputs(BtcTransaction transaction) {
         if (transaction.hasWitness()) {
             String message = "Removing signatures from SegWit transactions is not allowed.";
             logger.error("[removeSignaturesFromTransactionWithP2shMultiSigInputs] {}", message);
diff --git a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
index fdfc251531..0c687c942a 100644
--- a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
@@ -303,20 +303,20 @@ void test_extractRedeemScriptFromInput_migration_multiple_inputs() {
     }
 
     @Test
-    void removeSignaturesFromTransaction_whenTransactionDoesNotHaveInputs_shouldReturnSameTransaction() {
+    void getTransactionHashWithoutSignatures_whenTransactionDoesNotHaveInputs_shouldReturnSameTransaction() {
         // arrange
         BtcTransaction transaction = new BtcTransaction(btcMainnetParams);
         Sha256Hash transactionHashBeforeRemovingSignatures = transaction.getHash();
 
         // act
-        BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transaction);
+        Sha256Hash transactionHashWithoutSignatures = BitcoinUtils.getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, transaction);
 
         // assert
-        assertEquals(transactionHashBeforeRemovingSignatures, transaction.getHash());
+        assertEquals(transactionHashBeforeRemovingSignatures, transactionHashWithoutSignatures);
     }
 
     @Test
-    void removeSignaturesFromTransaction_whenTransactionIsSegwit_shouldThrowIllegalArgumentException() {
+    void getTransactionHashWithoutSignatures_whenTransactionIsSegwit_shouldReturnExpectedTxHash() {
         // arrange
         BtcTransaction transaction = new BtcTransaction(btcMainnetParams);
         transaction.addInput(BitcoinTestUtils.createHash(1), 0, new Script(new byte[]{}));
@@ -324,14 +324,15 @@ void removeSignaturesFromTransaction_whenTransactionIsSegwit_shouldThrowIllegalA
         transactionWitness.setPush(0, new byte[]{});
         transaction.setWitness(0, transactionWitness);
 
-        // act & assert
-        IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-            () -> BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transaction));
-        assertEquals("Removing signatures from SegWit transactions is not allowed.", exception.getMessage());
+        // act
+        Sha256Hash transactionHashWithoutSignatures = BitcoinUtils.getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, transaction);
+
+        // assert
+        assertEquals(transaction.getHash(), transactionHashWithoutSignatures);
     }
 
     @Test
-    void removeSignaturesFromTransaction_whenTransactionInputsDoNotHaveP2shMultiSigInputScript_shouldThrowIllegalArgumentException() {
+    void getTransactionHashWithoutSignatures_whenTxIsNotSegwitAndTransactionInputsDoNotHaveP2shMultiSigInputScript_shouldThrowIllegalArgumentException() {
         // arrange
         BtcTransaction transaction = new BtcTransaction(btcMainnetParams);
         BtcECKey pubKey = BitcoinTestUtils.getBtcEcKeyFromSeed("abc");
@@ -340,12 +341,12 @@ void removeSignaturesFromTransaction_whenTransactionInputsDoNotHaveP2shMultiSigI
 
         // act & assert
         IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-            () -> BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transaction));
+            () -> BitcoinUtils.getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, transaction));
         assertEquals("Cannot remove signatures from transaction inputs that do not have p2sh multisig input script.", exception.getMessage());
     }
 
     @Test
-    void removeSignaturesFromTransaction_whenNotAllTransactionInputsHaveP2shMultiSigInputScript_shouldThrowIllegalArgumentException() {
+    void getTransactionHashWithoutSignatures_whenTxIsNotSegwitButNotAllTransactionInputsHaveP2shMultiSigInputScript_shouldThrowIllegalArgumentException() {
         // arrange
         Federation federation = P2shErpFederationBuilder.builder().build();
         Script p2shMultiSigScriptSig = federation.getP2SHScript().createEmptyInputScript(null, federation.getRedeemScript());
@@ -358,12 +359,12 @@ void removeSignaturesFromTransaction_whenNotAllTransactionInputsHaveP2shMultiSig
 
         // act & assert
         IllegalArgumentException exception = Assertions.assertThrows(IllegalArgumentException.class,
-            () -> BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transaction));
+            () -> BitcoinUtils.getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, transaction));
         assertEquals("Cannot remove signatures from transaction inputs that do not have p2sh multisig input script.", exception.getMessage());
     }
 
     @Test
-    void removeSignaturesFromTransaction_whenTransactionIsLegacyAndInputsHaveP2shMultiSigInputScript_shouldRemoveSignatures() {
+    void getTransactionHashWithoutSignatures_whenTransactionIsLegacyAndInputsHaveP2shMultiSigInputScript_shouldReturnExpectedTxHash() {
         // arrange
         Federation federation = P2shErpFederationBuilder.builder().build();
         Script scriptSig = federation.getP2SHScript().createEmptyInputScript(null, federation.getRedeemScript());
@@ -372,7 +373,7 @@ void removeSignaturesFromTransaction_whenTransactionIsLegacyAndInputsHaveP2shMul
         transaction.addInput(BitcoinTestUtils.createHash(1), 0, scriptSig);
         transaction.addInput(BitcoinTestUtils.createHash(2), 0, scriptSig);
         transaction.addOutput(Coin.COIN, destinationAddress);
-        Sha256Hash transactionWithoutSignaturesHash = transaction.getHash();
+        Sha256Hash transactionHashBeforeSigning = transaction.getHash();
 
         List<BtcECKey> keysToSign = BitcoinTestUtils.getBtcEcKeysFromSeeds(new String[]{
             "member01",
@@ -391,10 +392,10 @@ void removeSignaturesFromTransaction_whenTransactionIsLegacyAndInputsHaveP2shMul
         }
 
         // act
-        BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transaction);
+        Sha256Hash transactionHashWithoutSignatures = BitcoinUtils.getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, transaction);
 
         // assert
-        assertEquals(transactionWithoutSignaturesHash, transaction.getHash());
+        assertEquals(transactionHashBeforeSigning, transactionHashWithoutSignatures);
     }
 
     @Test

From 30dafceae31c6e3022e3ae4ad6956f2abba5dcb8 Mon Sep 17 00:00:00 2001
From: julia-zack <julia.zack@iovlabs.org>
Date: Tue, 19 Nov 2024 14:08:00 -0300
Subject: [PATCH 2/4] Register spend transaction

---
 .../main/java/co/rsk/peg/BridgeSupport.java   |  44 +++--
 .../java/co/rsk/peg/BridgeSupportSvpTest.java | 187 ++++++++++++++----
 .../co/rsk/peg/bitcoin/BitcoinUtilsTest.java  |   2 +-
 3 files changed, 173 insertions(+), 60 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index 965e14f5c1..97287574fe 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -391,6 +391,14 @@ public void registerBtcTransaction(
                 throw new RegisterBtcTransactionException("Transaction already processed");
             }
 
+            if (svpIsOngoing() && isTheSvpSpendTransaction(btcTx)) {
+                markTxAsProcessed(btcTx);
+                saveNewUTXOs(btcTx);
+                provider.setSvpSpendTxHashUnsigned(null);
+                // proceed with svp success
+                return;
+            }
+
             PegTxType pegTxType = PegUtils.getTransactionType(
                 activations,
                 provider,
@@ -410,8 +418,8 @@ public void registerBtcTransaction(
                 case PEGOUT_OR_MIGRATION:
                     logger.debug("[registerBtcTransaction] This is a peg-out or migration tx {}", btcTx.getHash());
                     processPegoutOrMigration(btcTx);
-                    if (svpIsOngoing()) {
-                        updateSvpFundTransactionValuesIfPossible(btcTx);
+                    if (svpIsOngoing() && isTheSvpFundTransaction(btcTx)) {
+                        updateSvpFundTransactionValues(btcTx);
                     }
                     break;
                 default:
@@ -429,21 +437,13 @@ public void registerBtcTransaction(
         }
     }
 
-    private void updateSvpFundTransactionValuesIfPossible(BtcTransaction transaction) {
-        provider.getSvpFundTxHashUnsigned()
-            .filter(svpFundTxHashUnsigned -> isTheSvpFundTransaction(svpFundTxHashUnsigned, transaction))
-            .ifPresent(isTheSvpFundTransaction -> updateSvpFundTransactionValues(transaction));
-    }
-
-    private boolean isTheSvpFundTransaction(Sha256Hash svpFundTransactionHashUnsigned, BtcTransaction transaction) {
-        Sha256Hash transactionHash = transaction.getHash();
-
-        if (!transaction.hasWitness()) {
-            BtcTransaction transactionCopyWithoutSignatures = new BtcTransaction(networkParameters, transaction.bitcoinSerialize()); // this is needed to not remove signatures from the actual tx
-            BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transactionCopyWithoutSignatures);
-            transactionHash = transactionCopyWithoutSignatures.getHash();
-        }
-        return transactionHash.equals(svpFundTransactionHashUnsigned);
+    private boolean isTheSvpFundTransaction(BtcTransaction transaction) {
+        return provider.getSvpFundTxHashUnsigned()
+            .map(svpFundTransactionHashUnsigned -> {
+                Sha256Hash transactionHashWithoutSignatures = getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction);
+                return transactionHashWithoutSignatures.equals(svpFundTransactionHashUnsigned);
+            })
+            .orElse(false);
     }
 
     private void updateSvpFundTransactionValues(BtcTransaction transaction) {
@@ -455,6 +455,15 @@ private void updateSvpFundTransactionValues(BtcTransaction transaction) {
         provider.setSvpFundTxHashUnsigned(null);
     }
 
+    private boolean isTheSvpSpendTransaction(BtcTransaction transaction) {
+        return provider.getSvpSpendTxHashUnsigned()
+            .map(svpSpendTransactionHashUnsigned -> {
+                Sha256Hash transactionHashWithoutSignatures = getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction);
+                return transactionHashWithoutSignatures.equals(svpSpendTransactionHashUnsigned);
+            })
+            .orElse(false);
+    }
+
     private Script getLastRetiredFederationP2SHScript() {
         return federationSupport.getLastRetiredFederationP2SHScript().orElse(null);
     }
@@ -1760,7 +1769,6 @@ private void addSvpSpendTxSignatures(
         provider.getSvpSpendTxWaitingForSignatures()
             // The svpSpendTxWFS should always be present at this point, since we already checked isTheSvpSpendTx.
             .ifPresent(svpSpendTxWFS -> {
-
                 Keccak256 svpSpendTxCreationRskTxHash = svpSpendTxWFS.getKey();
                 BtcTransaction svpSpendTx = svpSpendTxWFS.getValue();
 
diff --git a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportSvpTest.java b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportSvpTest.java
index c2414dc678..f1de66bf26 100644
--- a/rskj-core/src/test/java/co/rsk/peg/BridgeSupportSvpTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/BridgeSupportSvpTest.java
@@ -82,6 +82,9 @@ public class BridgeSupportSvpTest {
     private Sha256Hash svpSpendTransactionHashUnsigned;
     private BtcTransaction svpSpendTransaction;
 
+    private PartialMerkleTree pmtWithTransactions;
+    private int btcBlockWithPmtHeight;
+
     @BeforeEach
     void setUp() {
         long rskExecutionBlockNumber = 1000L;
@@ -467,8 +470,6 @@ private void assertSvpFundTransactionValuesWereNotUpdated() {
     @TestInstance(TestInstance.Lifecycle.PER_CLASS)
     @Tag("Fund transaction registration tests")
     class FundTxRegistrationTests {
-        private PartialMerkleTree pmtWithTransactions;
-        private int btcBlockWithPmtHeight;
 
         @Test
         void registerBtcTransaction_forSvpFundTransactionChange_whenProposedFederationDoesNotExist_shouldRegisterTransactionButNotUpdateSvpFundTransactionValues() throws Exception {
@@ -595,43 +596,6 @@ void registerBtcTransaction_forSvpFundTransactionChange_whenSvpPeriodIsOngoing_s
             assertSvpFundTransactionValuesWereUpdated();
         }
 
-        private void setUpForTransactionRegistration(BtcTransaction transaction) throws BlockStoreException {
-            // recreate a valid chain that has the tx, so it passes the previous checks in registerBtcTransaction
-            BtcBlockStoreWithCache.Factory btcBlockStoreFactory = new RepositoryBtcBlockStoreWithCache.Factory(btcMainnetParams, 100, 100);
-            BtcBlockStoreWithCache btcBlockStoreWithCache = btcBlockStoreFactory.newInstance(repository, bridgeMainNetConstants, bridgeStorageProvider, allActivations);
-
-            pmtWithTransactions = createValidPmtForTransactions(Collections.singletonList(transaction.getHash()), btcMainnetParams);
-            btcBlockWithPmtHeight = bridgeMainNetConstants.getBtcHeightWhenPegoutTxIndexActivates() + bridgeMainNetConstants.getPegoutTxIndexGracePeriodInBtcBlocks(); // we want pegout tx index to be activated
-
-            int chainHeight = btcBlockWithPmtHeight + bridgeMainNetConstants.getBtc2RskMinimumAcceptableConfirmations();
-            recreateChainFromPmt(btcBlockStoreWithCache, chainHeight, pmtWithTransactions, btcBlockWithPmtHeight, btcMainnetParams);
-
-            bridgeStorageProvider.save();
-
-            bridgeSupport = bridgeSupportBuilder
-                .withBridgeConstants(bridgeMainNetConstants)
-                .withProvider(bridgeStorageProvider)
-                .withActivations(allActivations)
-                .withFederationSupport(federationSupport)
-                .withFeePerKbSupport(feePerKbSupport)
-                .withExecutionBlock(rskExecutionBlock)
-                .withBtcBlockStoreFactory(btcBlockStoreFactory)
-                .withRepository(repository)
-                .build();
-        }
-
-        private void assertActiveFederationUtxosSize(int expectedActiveFederationUtxosSize) {
-            assertEquals(expectedActiveFederationUtxosSize, federationSupport.getActiveFederationBtcUTXOs().size());
-        }
-
-        private void assertTransactionWasProcessed(Sha256Hash transactionHash) throws IOException {
-            Optional<Long> rskBlockHeightAtWhichBtcTxWasProcessed = bridgeStorageProvider.getHeightIfBtcTxhashIsAlreadyProcessed(transactionHash);
-            assertTrue(rskBlockHeightAtWhichBtcTxWasProcessed.isPresent());
-
-            long rskExecutionBlockNumber = rskExecutionBlock.getNumber();
-            assertEquals(rskExecutionBlockNumber, rskBlockHeightAtWhichBtcTxWasProcessed.get());
-        }
-
         private void assertSvpFundTransactionValuesWereUpdated() {
             Optional<BtcTransaction> svpFundTransactionSignedOpt = bridgeStorageProvider.getSvpFundTxSigned();
             assertTrue(svpFundTransactionSignedOpt.isPresent());
@@ -666,7 +630,7 @@ void updateCollections_whenSpendTxCanBeCreated_createsExpectedSpendTxAndSavesThe
             bridgeStorageProvider.save();
 
             // assert
-            svpSpendTransactionHashUnsigned = assertSvpSpendTxHashUnsignedWasSavedInStorage();
+            svpSpendTransactionHashUnsigned = assertSvpSpendTxHashUnsignedIsSavedInStorage();
             svpSpendTransaction = assertSvpSpendTxIsWaitingForSignatures();
             assertSvpSpendTxHasExpectedInputsAndOutputs();
 
@@ -727,7 +691,7 @@ private void assertInputHasExpectedScriptSig(TransactionInput input, Script rede
         }
     }
 
-    private Sha256Hash assertSvpSpendTxHashUnsignedWasSavedInStorage() {
+    private Sha256Hash assertSvpSpendTxHashUnsignedIsSavedInStorage() {
         Optional<Sha256Hash> svpSpendTransactionHashUnsignedOpt = bridgeStorageProvider.getSvpSpendTxHashUnsigned();
         assertTrue(svpSpendTransactionHashUnsignedOpt.isPresent());
 
@@ -982,6 +946,105 @@ private void assertFederatorSignedInputs(List<TransactionInput> inputs, List<Sha
         }
     }
 
+    @Nested
+    @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+    @Tag("Spend transaction registration tests")
+    class SpendTxRegistrationTests {
+        @Test
+        void registerBtcTransaction_whenValidationPeriodEnded_shouldNotProcessSpendTx() throws BlockStoreException, BridgeIllegalArgumentException, IOException {
+            // arrange
+            arrangeExecutionBlockIsAfterValidationPeriodEnded();
+
+            arrangeSvpSpendTransaction();
+            setUpForTransactionRegistration(svpSpendTransaction);
+
+            // act
+            int activeFederationUtxosSizeBeforeRegisteringTx = federationSupport.getActiveFederationBtcUTXOs().size();
+            bridgeSupport.registerBtcTransaction(
+                rskTx,
+                svpSpendTransaction.bitcoinSerialize(),
+                btcBlockWithPmtHeight,
+                pmtWithTransactions.bitcoinSerialize()
+            );
+            bridgeStorageProvider.save();
+
+            // assert
+            assertActiveFederationUtxosSize(activeFederationUtxosSizeBeforeRegisteringTx);
+            assertTransactionWasNotProcessed(svpSpendTransaction.getHash());
+            assertSvpSpendTxHashUnsignedIsSavedInStorage();
+        }
+
+        @Test
+        void registerBtcTransaction_whenIsTheSpendTransaction_shouldProcessSpendTx() throws BlockStoreException, BridgeIllegalArgumentException, IOException {
+            // arrange
+            arrangeSvpSpendTransaction();
+            setUpForTransactionRegistration(svpSpendTransaction);
+
+            // act
+            int activeFederationUtxosSizeBeforeRegisteringTx = federationSupport.getActiveFederationBtcUTXOs().size();
+            bridgeSupport.registerBtcTransaction(
+                rskTx,
+                svpSpendTransaction.bitcoinSerialize(),
+                btcBlockWithPmtHeight,
+                pmtWithTransactions.bitcoinSerialize()
+            );
+            bridgeStorageProvider.save();
+
+            // assert
+            assertActiveFederationUtxosSize(activeFederationUtxosSizeBeforeRegisteringTx + 1);
+            assertTransactionWasProcessed(svpSpendTransaction.getHash());
+            assertNoSvpSpendTxHash();
+        }
+
+        @Test
+        void registerBtcTransaction_whenIsNotTheSpendTransaction_shouldNotProcessSpendTx() throws BlockStoreException, BridgeIllegalArgumentException, IOException {
+            // arrange
+            arrangeSvpSpendTransaction();
+            setUpForTransactionRegistration(svpSpendTransaction);
+
+            BtcTransaction pegout = createPegout(proposedFederation.getRedeemScript());
+            savePegoutIndex(pegout);
+            signInputs(pegout);
+            setUpForTransactionRegistration(pegout);
+
+            // act
+            int activeFederationUtxosSizeBeforeRegisteringTx = federationSupport.getActiveFederationBtcUTXOs().size();
+            bridgeSupport.registerBtcTransaction(
+                rskTx,
+                pegout.bitcoinSerialize(),
+                btcBlockWithPmtHeight,
+                pmtWithTransactions.bitcoinSerialize()
+            );
+            bridgeStorageProvider.save();
+
+            // assert
+            assertActiveFederationUtxosSize(activeFederationUtxosSizeBeforeRegisteringTx + 1);
+            assertTransactionWasNotProcessed(svpSpendTransaction.getHash());
+            assertSvpSpendTxHashUnsignedIsSavedInStorage();
+        }
+
+        @Test
+        void registerBtcTransaction_whenSpendTransactionHashIsNotSaved_shouldNotProcessSpendTx() throws BlockStoreException, BridgeIllegalArgumentException, IOException {
+            // arrange
+            recreateSvpSpendTransactionUnsigned();
+            setUpForTransactionRegistration(svpSpendTransaction);
+
+            // act
+            int activeFederationUtxosSizeBeforeRegisteringTx = federationSupport.getActiveFederationBtcUTXOs().size();
+            bridgeSupport.registerBtcTransaction(
+                rskTx,
+                svpSpendTransaction.bitcoinSerialize(),
+                btcBlockWithPmtHeight,
+                pmtWithTransactions.bitcoinSerialize()
+            );
+            bridgeStorageProvider.save();
+
+            // assert
+            assertActiveFederationUtxosSize(activeFederationUtxosSizeBeforeRegisteringTx);
+            assertTransactionWasNotProcessed(svpSpendTransaction.getHash());
+        }
+    }
+
     private void arrangeExecutionBlockIsAfterValidationPeriodEnded() {
         long validationPeriodEndBlock = proposedFederation.getCreationBlockNumber()
             + bridgeMainNetConstants.getFederationConstants().getValidationPeriodDurationInBlocks();
@@ -1081,6 +1144,48 @@ private void saveSvpSpendTransactionValues() {
         bridgeStorageProvider.save();
     }
 
+    private void setUpForTransactionRegistration(BtcTransaction transaction) throws BlockStoreException {
+        // recreate a valid chain that has the tx, so it passes the previous checks in registerBtcTransaction
+        BtcBlockStoreWithCache.Factory btcBlockStoreFactory = new RepositoryBtcBlockStoreWithCache.Factory(btcMainnetParams, 100, 100);
+        BtcBlockStoreWithCache btcBlockStoreWithCache = btcBlockStoreFactory.newInstance(repository, bridgeMainNetConstants, bridgeStorageProvider, allActivations);
+
+        pmtWithTransactions = createValidPmtForTransactions(Collections.singletonList(transaction.getHash()), btcMainnetParams);
+        btcBlockWithPmtHeight = bridgeMainNetConstants.getBtcHeightWhenPegoutTxIndexActivates() + bridgeMainNetConstants.getPegoutTxIndexGracePeriodInBtcBlocks(); // we want pegout tx index to be activated
+
+        int chainHeight = btcBlockWithPmtHeight + bridgeMainNetConstants.getBtc2RskMinimumAcceptableConfirmations();
+        recreateChainFromPmt(btcBlockStoreWithCache, chainHeight, pmtWithTransactions, btcBlockWithPmtHeight, btcMainnetParams);
+
+        bridgeStorageProvider.save();
+
+        bridgeSupport = bridgeSupportBuilder
+            .withBridgeConstants(bridgeMainNetConstants)
+            .withProvider(bridgeStorageProvider)
+            .withActivations(allActivations)
+            .withFederationSupport(federationSupport)
+            .withFeePerKbSupport(feePerKbSupport)
+            .withExecutionBlock(rskExecutionBlock)
+            .withBtcBlockStoreFactory(btcBlockStoreFactory)
+            .withRepository(repository)
+            .build();
+    }
+
+    private void assertActiveFederationUtxosSize(int expectedActiveFederationUtxosSize) {
+        assertEquals(expectedActiveFederationUtxosSize, federationSupport.getActiveFederationBtcUTXOs().size());
+    }
+
+    private void assertTransactionWasProcessed(Sha256Hash transactionHash) throws IOException {
+        Optional<Long> rskBlockHeightAtWhichBtcTxWasProcessed = bridgeStorageProvider.getHeightIfBtcTxhashIsAlreadyProcessed(transactionHash);
+        assertTrue(rskBlockHeightAtWhichBtcTxWasProcessed.isPresent());
+
+        long rskExecutionBlockNumber = rskExecutionBlock.getNumber();
+        assertEquals(rskExecutionBlockNumber, rskBlockHeightAtWhichBtcTxWasProcessed.get());
+    }
+
+    private void assertTransactionWasNotProcessed(Sha256Hash transactionHash) throws IOException {
+        Optional<Long> rskBlockHeightAtWhichBtcTxWasProcessed = bridgeStorageProvider.getHeightIfBtcTxhashIsAlreadyProcessed(transactionHash);
+        assertFalse(rskBlockHeightAtWhichBtcTxWasProcessed.isPresent());
+    }
+
     private void assertNoSvpFundTxHashUnsigned() {
         assertFalse(bridgeStorageProvider.getSvpFundTxHashUnsigned().isPresent());
     }
diff --git a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
index 0c687c942a..779efec3ee 100644
--- a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
@@ -303,7 +303,7 @@ void test_extractRedeemScriptFromInput_migration_multiple_inputs() {
     }
 
     @Test
-    void getTransactionHashWithoutSignatures_whenTransactionDoesNotHaveInputs_shouldReturnSameTransaction() {
+    void getTransactionHashWithoutSignatures_whenTransactionDoesNotHaveInputs_shouldReturnExpectedTxHash() {
         // arrange
         BtcTransaction transaction = new BtcTransaction(btcMainnetParams);
         Sha256Hash transactionHashBeforeRemovingSignatures = transaction.getHash();

From 007ffada143f72d420c07957362172d7b8b95c1d Mon Sep 17 00:00:00 2001
From: julia-zack <julia.zack@iovlabs.org>
Date: Wed, 20 Nov 2024 11:31:21 -0300
Subject: [PATCH 3/4] Create new registerSvpSpendTransaction method. Refactor
 to make code cleaner

---
 .../main/java/co/rsk/peg/BridgeSupport.java   | 34 ++++++++++---------
 .../java/co/rsk/peg/bitcoin/BitcoinUtils.java |  6 ++--
 .../co/rsk/peg/bitcoin/BitcoinUtilsTest.java  |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index 97287574fe..e24c8659b1 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -391,11 +391,8 @@ public void registerBtcTransaction(
                 throw new RegisterBtcTransactionException("Transaction already processed");
             }
 
-            if (svpIsOngoing() && isTheSvpSpendTransaction(btcTx)) {
-                markTxAsProcessed(btcTx);
-                saveNewUTXOs(btcTx);
-                provider.setSvpSpendTxHashUnsigned(null);
-                // proceed with svp success
+            if (isSvpOngoing() && isTheSvpSpendTransaction(btcTx)) {
+                registerSvpSpendTransaction(btcTx);
                 return;
             }
 
@@ -418,7 +415,7 @@ public void registerBtcTransaction(
                 case PEGOUT_OR_MIGRATION:
                     logger.debug("[registerBtcTransaction] This is a peg-out or migration tx {}", btcTx.getHash());
                     processPegoutOrMigration(btcTx);
-                    if (svpIsOngoing() && isTheSvpFundTransaction(btcTx)) {
+                    if (isSvpOngoing() && isTheSvpFundTransaction(btcTx)) {
                         updateSvpFundTransactionValues(btcTx);
                     }
                     break;
@@ -439,10 +436,9 @@ public void registerBtcTransaction(
 
     private boolean isTheSvpFundTransaction(BtcTransaction transaction) {
         return provider.getSvpFundTxHashUnsigned()
-            .map(svpFundTransactionHashUnsigned -> {
-                Sha256Hash transactionHashWithoutSignatures = getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction);
-                return transactionHashWithoutSignatures.equals(svpFundTransactionHashUnsigned);
-            })
+            .map(svpFundTransactionHashUnsigned ->
+                getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction).equals(svpFundTransactionHashUnsigned)
+            )
             .orElse(false);
     }
 
@@ -457,13 +453,19 @@ private void updateSvpFundTransactionValues(BtcTransaction transaction) {
 
     private boolean isTheSvpSpendTransaction(BtcTransaction transaction) {
         return provider.getSvpSpendTxHashUnsigned()
-            .map(svpSpendTransactionHashUnsigned -> {
-                Sha256Hash transactionHashWithoutSignatures = getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction);
-                return transactionHashWithoutSignatures.equals(svpSpendTransactionHashUnsigned);
-            })
+            .map(svpSpendTransactionHashUnsigned ->
+                getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction).equals(svpSpendTransactionHashUnsigned)
+            )
             .orElse(false);
     }
 
+    private void registerSvpSpendTransaction(BtcTransaction svpSpendTx) throws IOException {
+        markTxAsProcessed(svpSpendTx);
+        saveNewUTXOs(svpSpendTx);
+        provider.setSvpSpendTxHashUnsigned(null);
+        // proceed with svp success
+    }
+
     private Script getLastRetiredFederationP2SHScript() {
         return federationSupport.getLastRetiredFederationP2SHScript().orElse(null);
     }
@@ -1091,7 +1093,7 @@ private void allowFederationElectionAgain() {
         provider.clearSvpValues();
     }
 
-    private boolean svpIsOngoing() {
+    private boolean isSvpOngoing() {
         return federationSupport.getProposedFederation()
             .filter(this::validationPeriodIsOngoing)
             .isPresent();
@@ -1674,7 +1676,7 @@ public void addSignature(BtcECKey federatorBtcPublicKey, List<byte[]> signatures
 
         Context.propagate(btcContext);
 
-        if (svpIsOngoing() && isSvpSpendTx(releaseCreationRskTxHash)) {
+        if (isSvpOngoing() && isSvpSpendTx(releaseCreationRskTxHash)) {
             logger.trace("[addSignature] Going to sign svp spend transaction with federator public key {}", federatorBtcPublicKey);
             addSvpSpendTxSignatures(federatorBtcPublicKey, signatures);
             return;
diff --git a/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java b/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
index 747625b72e..6285b39a19 100644
--- a/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
+++ b/rskj-core/src/main/java/co/rsk/peg/bitcoin/BitcoinUtils.java
@@ -58,15 +58,13 @@ public static Optional<Script> extractRedeemScriptFromInput(TransactionInput txI
     }
 
     public static Sha256Hash getMultiSigTransactionHashWithoutSignatures(NetworkParameters networkParameters, BtcTransaction transaction) {
-        Sha256Hash transactionHash = transaction.getHash();
-
         if (!transaction.hasWitness()) {
             BtcTransaction transactionCopyWithoutSignatures = new BtcTransaction(networkParameters, transaction.bitcoinSerialize()); // this is needed to not remove signatures from the actual tx
             BitcoinUtils.removeSignaturesFromTransactionWithP2shMultiSigInputs(transactionCopyWithoutSignatures);
-            transactionHash = transactionCopyWithoutSignatures.getHash();
+            return transactionCopyWithoutSignatures.getHash();
         }
 
-        return transactionHash;
+        return transaction.getHash();
     }
 
     private static void removeSignaturesFromTransactionWithP2shMultiSigInputs(BtcTransaction transaction) {
diff --git a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
index 779efec3ee..08517d0b27 100644
--- a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
@@ -303,7 +303,7 @@ void test_extractRedeemScriptFromInput_migration_multiple_inputs() {
     }
 
     @Test
-    void getTransactionHashWithoutSignatures_whenTransactionDoesNotHaveInputs_shouldReturnExpectedTxHash() {
+    void getTransactionHashWithoutSignatures_whenTransactionDoesNotHaveInputs_shouldReturnSameTxHash() {
         // arrange
         BtcTransaction transaction = new BtcTransaction(btcMainnetParams);
         Sha256Hash transactionHashBeforeRemovingSignatures = transaction.getHash();

From 29bc369da5b670973fa2a78151df9fcb6f8f6e2b Mon Sep 17 00:00:00 2001
From: julia-zack <julia.zack@iovlabs.org>
Date: Thu, 21 Nov 2024 14:26:25 -0300
Subject: [PATCH 4/4] Add test for getTxHashWithoutSigs using a real pegout.
 Minor refactor

---
 .../src/main/java/co/rsk/peg/BridgeSupport.java  |  4 ++--
 .../co/rsk/peg/bitcoin/BitcoinUtilsTest.java     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
index e24c8659b1..a5941322cb 100644
--- a/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
+++ b/rskj-core/src/main/java/co/rsk/peg/BridgeSupport.java
@@ -453,10 +453,10 @@ private void updateSvpFundTransactionValues(BtcTransaction transaction) {
 
     private boolean isTheSvpSpendTransaction(BtcTransaction transaction) {
         return provider.getSvpSpendTxHashUnsigned()
-            .map(svpSpendTransactionHashUnsigned ->
+            .filter(svpSpendTransactionHashUnsigned ->
                 getMultiSigTransactionHashWithoutSignatures(networkParameters, transaction).equals(svpSpendTransactionHashUnsigned)
             )
-            .orElse(false);
+            .isPresent();
     }
 
     private void registerSvpSpendTransaction(BtcTransaction svpSpendTx) throws IOException {
diff --git a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
index 08517d0b27..30419ba939 100644
--- a/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
+++ b/rskj-core/src/test/java/co/rsk/peg/bitcoin/BitcoinUtilsTest.java
@@ -398,6 +398,22 @@ void getTransactionHashWithoutSignatures_whenTransactionIsLegacyAndInputsHaveP2s
         assertEquals(transactionHashBeforeSigning, transactionHashWithoutSignatures);
     }
 
+    @Test
+    void getTransactionHashWithoutSignatures_forRealPegout() {
+        // arrange
+        // getting the btc raw tx from a real release_btc event
+        byte[] btcRawTxFromReleaseBtcEvent = Hex.decode("0200000001de890a3fcdf7391f8f66d0b04e26d8ef05c342c4ad5b5feb64e24b525aa1721001000000fd3a0300483045022100ba4f30ded162d3203c89c73c03e8c6001255ab62fb7e258a92b112f7cefe2e8e0220683d7e552b0e812257be4fb41f9d2a0b99a91e2cd8bc5e9eb2305a0ddf6b833c01483045022100c8705daac34ec164ef1a441a24f9f9661ecf5bd271d2d6d85d4bd11d444d65e7022065599fc87a8d335f0ddee2a93ed442fae55e08d514f16ba087d4442f3cb2fca001483045022100a85719ee3b3e8bc3716900575b059fd40b1f3852d4de58efa6de1185d6ed5bda022052beda3d8597f4071918136c2cfd8f80aede4aaf6e8710585d2e5fbe988fd0ce0147304402205e90f4c98d2187a1021d7200f40b11623d4e6d3e99d5481b70bedadda10be759022071a3bac20aa917abd46bdedd52d97033050cb8da28f9b93507c93af69ffe67f201483045022100eb2fc5dd75c210311bbb0a0f9eacbd0675e61d413a2b227422232735fd95238602204f92e268e55b113c732b4351ba2049ff48b6347ba6e9a4efe9da70fb97f321e601004dc901645521020ace50bab1230f8002a0bfe619482af74b338cc9e4c956add228df47e6adae1c21025093f439fb8006fd29ab56605ffec9cdc840d16d2361004e1337a2f86d8bd2db210275d473555de2733c47125f9702b0f870df1d817379f5587f09b6c40ed2c6c9492102a95f095d0ce8cb3b9bf70cc837e3ebe1d107959b1fa3f9b2d8f33446f9c8cbdb2103250c11be0561b1d7ae168b1f59e39cbc1fd1ba3cf4d2140c1a365b2723a2bf9321034851379ec6b8a701bd3eef8a0e2b119abb4bdde7532a3d6bcbff291b0daf3f25210350179f143a632ce4e6ac9a755b82f7f4266cfebb116a42cadb104c2c2a3350f92103b04fbd87ef5e2c0946a684c8c93950301a45943bbe56d979602038698facf9032103b58a5da144f5abab2e03e414ad044b732300de52fa25c672a7f7b3588877190659ae670350cd00b275532102370a9838e4d15708ad14a104ee5606b36caaaaf739d833e67770ce9fd9b3ec80210257c293086c4d4fe8943deda5f890a37d11bebd140e220faa76258a41d077b4d42103c2660a46aa73078ee6016dee953488566426cf55fc8011edd0085634d75395f92103cd3e383ec6e12719a6c69515e5559bcbe037d0aa24c187e1e26ce932e22ad7b354ae68ffffffff0258369b02000000001976a91481769a94a036ceba700a71467f6cef39652acfd688ac33aa0c9d0000000017a914d3530b561910c250f58fbd572d2f7a7d847354ef8700000000");
+        BtcTransaction btcTxFromReleaseBtcEvent = new BtcTransaction(btcMainnetParams, btcRawTxFromReleaseBtcEvent);
+
+        // act
+        Sha256Hash btcTxHashWithoutSigs = getMultiSigTransactionHashWithoutSignatures(btcMainnetParams, btcTxFromReleaseBtcEvent);
+
+        // assert
+        // the tx hash emitted in the release_requested event does not have the signatures
+        Sha256Hash hashFromReleaseRequestedEvent = Sha256Hash.wrap("7fba184a41c4ca22e2b806bdd961c4e52b1bd2a1d2552bbe61cbba4d56c00fae");
+        assertEquals(hashFromReleaseRequestedEvent, btcTxHashWithoutSigs);
+    }
+
     @Test
     void addInputFromOutputSentToScript_withNoMatchingOutputScript_shouldNotAddInput() {
         // arrange