Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore non-standard outputs when searching for the witness commitment hash #378

Merged
merged 3 commits into from
Jan 27, 2025
Merged

Ignore non-standard outputs when searching for the witness commitment hash #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccda8f2
- Removed unused constant
nathanieliov Jan 8, 2025
ee05e4d
Fix failing test
nathanieliov Jan 24, 2025
6195ec9
Set RSKIP460 true as default for mock activations
nathanieliov Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/co/rsk/federate/BtcToRskClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ private void validateCoinbaseInformation(CoinbaseInformation coinbaseInformation
throw new IllegalArgumentException(message);
}

Optional<co.rsk.bitcoinj.core.Sha256Hash> expectedWitnessCommitment = BitcoinUtils.findWitnessCommitment(coinbaseTransaction);
Optional<co.rsk.bitcoinj.core.Sha256Hash> expectedWitnessCommitment = BitcoinUtils.findWitnessCommitment(coinbaseTransaction, federatorSupport.getConfigForBestBlock());
co.rsk.bitcoinj.core.Sha256Hash calculatedWitnessCommitment = co.rsk.bitcoinj.core.Sha256Hash.twiceOf(
witnessMerkleRoot.getReversedBytes(),
witnessReservedValue
Expand Down
12 changes: 10 additions & 2 deletions src/test/java/co/rsk/federate/BtcToRskClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import co.rsk.federate.signing.utils.TestUtils;
import co.rsk.net.NodeBlockProcessor;
import co.rsk.peg.PegUtilsLegacy;
import co.rsk.peg.bitcoin.BitcoinUtils;
import co.rsk.peg.btcLockSender.*;
import co.rsk.peg.btcLockSender.BtcLockSender.TxSenderAddressType;
import co.rsk.peg.constants.BridgeConstants;
Expand All @@ -39,6 +38,7 @@
import org.bitcoinj.script.Script;
import org.bitcoinj.store.BlockStoreException;
import org.ethereum.config.blockchain.upgrades.ActivationConfig;
import org.ethereum.config.blockchain.upgrades.ActivationConfig.ForBlock;
import org.ethereum.config.blockchain.upgrades.ConsensusRule;
import org.ethereum.crypto.HashUtil;
import org.ethereum.util.ByteUtil;
Expand All @@ -61,12 +61,18 @@ class BtcToRskClientTest {
private BtcToRskClientBuilder btcToRskClientBuilder;
private List<BtcECKey> federationPrivateKeys;
private NetworkParameters networkParameters;
private ForBlock activationsForBlock;

@BeforeEach
void setup() throws PeginInstructionsException, IOException {
activationConfig = mock(ActivationConfig.class);
when(activationConfig.forBlock(anyLong())).thenReturn(mock(ActivationConfig.ForBlock.class));
when(activationConfig.isActive(eq(ConsensusRule.RSKIP89), anyLong())).thenReturn(true);
when(activationConfig.isActive(eq(ConsensusRule.RSKIP460), anyLong())).thenReturn(true);

activationsForBlock = mock(ForBlock.class);
when(activationConfig.forBlock(anyLong())).thenReturn(activationsForBlock);
when(activationsForBlock.isActive(eq(ConsensusRule.RSKIP89))).thenReturn(true);
when(activationsForBlock.isActive(eq(ConsensusRule.RSKIP460))).thenReturn(true);

bridgeRegTestConstants = new BridgeRegTestConstants();
networkParameters = ThinConverter.toOriginalInstance(bridgeRegTestConstants.getBtcParamsString());
Expand Down Expand Up @@ -476,9 +482,11 @@ void onBlock_including_segwit_tx_registers_coinbase() throws Exception {

ActivationConfig mockedActivationConfig = mock(ActivationConfig.class);
when(mockedActivationConfig.isActive(eq(ConsensusRule.RSKIP143), anyLong())).thenReturn(true);
when(mockedActivationConfig.isActive(eq(ConsensusRule.RSKIP460), anyLong())).thenReturn(true);

FederatorSupport federatorSupport = mock(FederatorSupport.class);
when(federatorSupport.getFederationMember()).thenReturn(activeFederationMember);
when(federatorSupport.getConfigForBestBlock()).thenReturn(activationsForBlock);

BtcToRskClient client = spy(buildWithFactoryAndSetup(
federatorSupport,
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/co/rsk/federate/bitcoin/BitcoinTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.bouncycastle.util.encoders.Hex;
import org.ethereum.crypto.HashUtil;

public final class BitcoinTestUtils {

public static final byte[] WITNESS_COMMITMENT_HEADER = Hex.decode("aa21a9ed");
public static final Sha256Hash WITNESS_RESERVED_VALUE = Sha256Hash.ZERO_HASH;
public static final int WITNESS_COMMITMENT_LENGTH = WITNESS_COMMITMENT_HEADER.length + Sha256Hash.LENGTH;

private BitcoinTestUtils() { }

public static List<Coin> coinListOf(long... values) {
Expand Down
Loading