Set bitcoinj-thin and bitcoinj dependencies to versions that support BTC testnet4

build.gradle

@@ -204,8 +204,8 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 ext {
-    bitcoinjcoreVersion = '0.15.6-rsk-5'
-    bitcoinjVersion = '0.14.4-rsk-18'
+    bitcoinjcoreVersion = '0.15.6-rsk-6-SNAPSHOT'
+    bitcoinjVersion = '0.14.4-rsk-19-SNAPSHOT'
     commonsLang3Version = '3.12.0'
     commonsIoVersion = '2.11.0'
     slf4jVersion = '1.7.36'

src/main/java/co/rsk/federate/signing/hsm/config/NetworkDifficultyCap.java

@@ -3,17 +3,18 @@
 import java.math.BigInteger;
 
 public enum NetworkDifficultyCap {
-  MAINNET(new BigInteger("7000000000000000000000")),
-  TESTNET(BigInteger.valueOf(3000000000L)),
-  REGTEST(BigInteger.valueOf(20L));
+    MAINNET(new BigInteger("7000000000000000000000")),
+    TESTNET2(BigInteger.valueOf(3000000000L)),
+    TESTNET(BigInteger.valueOf(3000000000L)),
+    REGTEST(BigInteger.valueOf(20L));
 
-  private final BigInteger difficultyCap;
+    private final BigInteger difficultyCap;
 
-  NetworkDifficultyCap(BigInteger difficultyCap) {
+    NetworkDifficultyCap(BigInteger difficultyCap) {
     this.difficultyCap = difficultyCap;
-  }
+    }
 
-  public BigInteger getDifficultyCap() {
+    public BigInteger getDifficultyCap() {
     return difficultyCap;
   }
 }

src/main/java/co/rsk/federate/signing/hsm/config/PowHSMConfig.java

@@ -113,38 +113,36 @@ public BigInteger getDifficultyTarget(HSMBookkeepingClient hsmClient) throws HSM
     }
   }
 
-  /**
-   * Retrieves the difficulty cap for a given network parameter.
-   * The difficulty cap is determined based on the network type (mainnet, testnet,
-   * or regtest). This value will be used to determine the maximum allowed
-   * difficulty for any given block.
-   * 
-   * @param networkParameter the network parameter identifier, which can be one of
-   *                         the following:
-   *                         <ul>
-   *                         <li>{@link NetworkParameters#ID_MAINNET} - Mainnet
-   *                         network</li>
-   *                         <li>{@link NetworkParameters#ID_TESTNET} - Testnet
-   *                         network</li>
-   *                         <li>{@link NetworkParameters#ID_REGTEST} - Regtest
-   *                         network</li>
-   *                         </ul>
-   * @return the difficulty cap as a {@link BigInteger} for the specified network.
-   * @throws IllegalArgumentException if the provided network parameter is
-   *                                  invalid.
-   */
-  public BigInteger getDifficultyCap(String networkParameter) {
-    switch (networkParameter) {
-      case NetworkParameters.ID_MAINNET:
-        return NetworkDifficultyCap.MAINNET.getDifficultyCap();
-      case NetworkParameters.ID_TESTNET:
-        return NetworkDifficultyCap.TESTNET.getDifficultyCap();
-      case NetworkParameters.ID_REGTEST:
-        return NetworkDifficultyCap.REGTEST.getDifficultyCap();
-      default:
-        String message = "Invalid network provided: " + networkParameter;
-        logger.error(message);
-        throw new IllegalArgumentException(message);
+    /**
+    * Retrieves the difficulty cap for a given network parameter.
+    * The difficulty cap is determined based on the network type (mainnet, testnet,
+    * or regtest). This value will be used to determine the maximum allowed
+    * difficulty for any given block.
+    *
+    * @param networkParameter the network parameter identifier, which can be one of the following:
+    * <ul>
+    *   <li>{@link NetworkParameters#ID_MAINNET} - Mainnet network</li>
+    *   <li>{@link NetworkParameters#ID_TESTNET4} - Testnet4 network</li>
+    *   <li>{@link NetworkParameters#ID_TESTNET} - Testnet network</li>
+    *   <li>{@link NetworkParameters#ID_REGTEST} - Regtest network</li>
+    * </ul>
+    * @return the difficulty cap as a {@link BigInteger} for the specified network.
+    * @throws IllegalArgumentException if the provided network parameter is invalid.
+    */
+    public BigInteger getDifficultyCap(String networkParameter) {
+        switch (networkParameter) {
+            case NetworkParameters.ID_MAINNET:
+                return NetworkDifficultyCap.MAINNET.getDifficultyCap();
+            case NetworkParameters.ID_TESTNET4:
+                return NetworkDifficultyCap.TESTNET2.getDifficultyCap();
+            case NetworkParameters.ID_TESTNET:
+                return NetworkDifficultyCap.TESTNET.getDifficultyCap();
+            case NetworkParameters.ID_REGTEST:
+                return NetworkDifficultyCap.REGTEST.getDifficultyCap();
+            default:
+                String message = "Invalid network provided: " + networkParameter;
+                logger.error(message);
+                throw new IllegalArgumentException(message);
+        }
     }
-  }
 }

src/test/java/co/rsk/federate/signing/hsm/config/PowHSMConfigTest.java

@@ -148,10 +148,14 @@ void isStoppingBookkeepingScheduler_whenCustomConfigNotAvailable_shouldReturnDef
 
   @ParameterizedTest
   @MethodSource("provideNetworkParametersAndExpectedCaps")
-  void getDifficultyCap_whenGivenNetwork_shouldMatchExpectedDifficultyCap(String networkId,
-      NetworkDifficultyCap expectedNetworkDifficultyCap) {
-    assertEquals(expectedNetworkDifficultyCap.getDifficultyCap(),
-        powHsmConfig.getDifficultyCap(networkId));
+  void getDifficultyCap_whenGivenNetwork_shouldMatchExpectedDifficultyCap(
+      String networkId,
+      NetworkDifficultyCap expectedNetworkDifficultyCap
+  ) {
+      assertEquals(
+          expectedNetworkDifficultyCap.getDifficultyCap(),
+          powHsmConfig.getDifficultyCap(networkId)
+      );
   }
 
   @Test
@@ -179,6 +183,7 @@ private static Stream<Arguments> powHSMConfigParameterProvider() {
   static Stream<Arguments> provideNetworkParametersAndExpectedCaps() {
     return Stream.of(
         Arguments.of(NetworkParameters.ID_MAINNET, NetworkDifficultyCap.MAINNET),
+        Arguments.of(NetworkParameters.ID_TESTNET4, NetworkDifficultyCap.TESTNET2),
         Arguments.of(NetworkParameters.ID_TESTNET, NetworkDifficultyCap.TESTNET),
         Arguments.of(NetworkParameters.ID_REGTEST, NetworkDifficultyCap.REGTEST));
   }