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 96e23d2c2e..656d8ced9f 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 @@ -16,7 +16,7 @@ public class BitcoinUtils { protected static final byte[] WITNESS_COMMITMENT_HEADER = Hex.decode("aa21a9ed"); protected static final int WITNESS_COMMITMENT_LENGTH = WITNESS_COMMITMENT_HEADER.length + Sha256Hash.LENGTH; - private static final int MINIMUM_WITNESS_COMMITMENT_SIZE = WITNESS_COMMITMENT_LENGTH + 2; // 1 extra by for OP_RETURN and another one for data length + private static final int MINIMUM_WITNESS_COMMITMENT_SIZE = WITNESS_COMMITMENT_LENGTH + 2; // 1 extra byte for OP_RETURN and another one for data length private static final Logger logger = LoggerFactory.getLogger(BitcoinUtils.class); private static final int FIRST_INPUT_INDEX = 0; @@ -125,7 +125,7 @@ public static Optional findWitnessCommitment(BtcTransaction tx, Acti return Optional.of(witnessCommitment); } } catch (ScriptException e) { - logger.debug( + logger.warn( "[findWitnessCommitment] Failed to extract witness commitment from output {}. {}", output, e.getMessage() 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 171b4206cc..0a379241c6 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 @@ -31,7 +31,7 @@ class BitcoinUtilsTest { private static final int FIRST_INPUT_INDEX = 0; private static final ActivationConfig.ForBlock arrowHeadActivations = ActivationConfigsForTest.arrowhead600().forBlock(0); - private static final ActivationConfig.ForBlock lovellActivations = ActivationConfigsForTest.lovell700().forBlock(0); + private static final ActivationConfig.ForBlock allActivations = ActivationConfigsForTest.all().forBlock(0); private Address destinationAddress; @@ -552,7 +552,7 @@ void findWitnessCommitment_whenTxHasNoOutputs_shouldThrowException(ActivationCon private static Stream activationsProvider() { return Stream.of( Arguments.of(arrowHeadActivations), - Arguments.of(lovellActivations) + Arguments.of(allActivations) ); } @@ -662,7 +662,7 @@ void findWitnessCommitment_withRealTransaction_shouldReturnExpectedValue(Activat @ParameterizedTest @MethodSource("activationsProvider") - void findWitnessCommitment_withDataLargenThanExpected_shouldReturnEmpty(ActivationConfig.ForBlock activations) { + void findWitnessCommitment_withDataLargerThanExpected_shouldReturnEmpty(ActivationConfig.ForBlock activations) { // Arrange BtcTransaction btcTx = BitcoinTestUtils.createCoinbaseTransaction(btcMainnetParams); @@ -715,7 +715,7 @@ void findWitnessCommitment_whenMalFormedTxAfterRSKIP460_shouldIgnoreMalformedOut BtcTransaction malFormedCoinbaseTx, Sha256Hash expectedWitnessCommitment) { // Act Optional witnessCommitment = BitcoinUtils.findWitnessCommitment( - malFormedCoinbaseTx, lovellActivations); + malFormedCoinbaseTx, allActivations); // Assert assertTrue(witnessCommitment.isPresent());