Merge pull request #2934 from rsksmart/update-bitcoinj-thin-version

Update bitcoinj-thin version to 0.14.4-rsk-17
rsksmart · Jan 15, 2025 · 95a8f1a · 95a8f1a
2 parents c5e3dc4 + 33bc1d4
commit 95a8f1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -54,12 +54,12 @@
             <sha256 value="c717c468bfc91536f1dbc0d98d6116a8e7c49fbaff643ef8710e7505cc450878" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-16">
-         <artifact name="bitcoinj-thin-0.14.4-rsk-16.jar">
-            <sha256 value="53957d6941a882f7aa33188da3dadcf96f15fa2ffd62e9130937eb84e98f11a4" origin="Generated by Gradle"/>
+      <component group="co.rsk.bitcoinj" name="bitcoinj-thin" version="0.14.4-rsk-17">
+         <artifact name="bitcoinj-thin-0.14.4-rsk-17.jar">
+            <sha256 value="beff6002e72162984daa3e7016b1a6fb6d372e5cfb14101a50d150c0adfbda71" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="bitcoinj-thin-0.14.4-rsk-16.pom">
-            <sha256 value="ea7726838385d7694f63622398d871b92a247b83418fe4d6cb9c6f3d5991fd3a" origin="Generated by Gradle"/>
+         <artifact name="bitcoinj-thin-0.14.4-rsk-17.pom">
+            <sha256 value="32fca4aac555f60d824cda58f69e64a7641f60dbbf5ec733966dbe2ded3214d7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.diffplug.durian" name="durian-collect" version="1.2.0">

diff --git a/rskj-core/build.gradle b/rskj-core/build.gradle
@@ -273,7 +273,7 @@ ext {
             jaxwsRtVer             : '2.3.5',
             picocliVer             : '4.6.3',
 
-            bitcoinjThinVer: '0.14.4-rsk-17-SNAPSHOT',
+            bitcoinjThinVer: '0.14.4-rsk-17',
             rskjNativeVer: '1.3.0',
     ]
 

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
@@ -398,7 +398,6 @@ void findWitnessCommitment_whenTxHasNoOutputs_shouldThrowException() {
 
             // Act
             assertThrows(IllegalStateException.class, () -> BitcoinUtils.findWitnessCommitment(btcTx));
-            assertThrows(IllegalStateException.class, btcTx::findWitnessCommitment);
         }
 
         @Test
@@ -417,7 +416,6 @@ void findWitnessCommitment_whenTxIsNotCoinbase_shouldThrowException() {
 
             // Act
             assertThrows(IllegalStateException.class, () -> BitcoinUtils.findWitnessCommitment(btcTx));
-            assertThrows(IllegalStateException.class, btcTx::findWitnessCommitment);
         }
 
         @Test
@@ -430,7 +428,6 @@ void findWitnessCommitment_whenNoWitnessCommitment_shouldReturnEmpty() {
 
             // Assert
             assertFalse(witnessCommitment.isPresent());
-            assertNull(btcTx.findWitnessCommitment());
         }
 
         @Test
@@ -448,7 +445,6 @@ void findWitnessCommitment_withWitnessCommitment_shouldReturnExpectedValue() {
             // Assert
             assertTrue(witnessCommitmentFound.isPresent());
             assertEquals(witnessCommitment, witnessCommitmentFound.get());
-            assertEquals(witnessCommitment, btcTx.findWitnessCommitment());
         }
 
         @Test
@@ -468,7 +464,6 @@ void findWitnessCommitment_withMultipleWitnessCommitments_shouldReturnLastOne()
             // Assert
             assertTrue(witnessCommitmentFound.isPresent());
             assertEquals(witnessCommitment3, witnessCommitmentFound.get());
-            assertEquals(witnessCommitment3, btcTx.findWitnessCommitment());
         }
 
         @Test
@@ -485,7 +480,6 @@ void findWitnessCommitment_withWrongWitnessCommitment_shouldReturnEmpty() {
 
             // Assert
             assertFalse(witnessCommitment.isPresent());
-            assertEquals(fakeWitnessCommitment, btcTx.findWitnessCommitment()); // bitcoinj implementation detects it as a valid witness commitment
         }
 
         @Test
@@ -502,7 +496,6 @@ void findWitnessCommitment_withRealTransaction_shouldReturnExpectedValue() {
             // Assert
             assertTrue(witnessCommitment.isPresent());
             assertEquals(expectedWitnessCommitment, witnessCommitment.get());
-            assertEquals(expectedWitnessCommitment, btcTx.findWitnessCommitment());
         }
     }
 
@@ -530,6 +523,5 @@ void findWitnessCommitment_withDataLargenThanExpected_shouldReturnEmpty() {
 
         // Assert, should not find the commitment since the data length != 36 bytes
         assertFalse(obtainedWitnessCommitment.isPresent());
-        assertNull(btcTx.findWitnessCommitment());
     }
 }