mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-15 04:11:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

ScriptPattern: simplify isWitnessCommitment() and extractWitnessCommitmentHash()

Browse source 
It now operates on bytes, rather than chunks. This also adds a bit of JavaDoc
and a couple of tests.
This commit is contained in:
Andreas Schildbach 2024-11-20 17:58:46 +01:00
parent 2589c0d7fc
commit c88e973826
2 changed files with 62 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/src/main/java/org/bitcoinj/script/ScriptPattern.java
View file

@ -266,25 +266,23 @@ public class ScriptPattern {
/** /**
* Returns whether this script matches the pattern for a segwit commitment (in an output of the coinbase * Returns whether this script matches the pattern for a segwit commitment (in an output of the coinbase
* transaction). * transaction).
* See <a href="https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#commitment-structure">BIP141</a>.
*/ */
public static boolean isWitnessCommitment(Script script) { public static boolean isWitnessCommitment(Script script) {
List<ScriptChunk> chunks = script.chunks(); byte[] bytes = script.program();
if (chunks.size() < 2) return bytes.length >= 38
return false; && bytes[0] == ScriptOpCodes.OP_RETURN
if (!chunks.get(0).equalsOpCode(ScriptOpCodes.OP_RETURN)) && bytes[1] == 36 // length byte
return false; && Arrays.equals(Arrays.copyOfRange(bytes, 2, 6), SEGWIT_COMMITMENT_HEADER);
byte[] chunkData = chunks.get(1).data;
if (chunkData == null || chunkData.length != 36)
return false;
if (!Arrays.equals(Arrays.copyOfRange(chunkData, 0, 4), SEGWIT_COMMITMENT_HEADER))
return false;
return true;
} }
/** /**
* Retrieves the hash from a segwit commitment (in an output of the coinbase transaction). * Retrieves the hash from a segwit commitment (in an output of the coinbase transaction).
* You will want to guard calls to this method with {@link #isWitnessCommitment(Script)}.
* See <a href="https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki#commitment-structure">BIP141</a>.
*/ */
public static Sha256Hash extractWitnessCommitmentHash(Script script) { public static Sha256Hash extractWitnessCommitmentHash(Script script) {
return Sha256Hash.wrap(Arrays.copyOfRange(script.chunks().get(1).data, 4, 36)); byte[] hash = Arrays.copyOfRange(script.program(), 6, 38);
return Sha256Hash.wrap(hash);
} }
} }

52
core/src/test/java/org/bitcoinj/script/ScriptPatternTest.java
View file

@ -19,6 +19,7 @@
package org.bitcoinj.script; package org.bitcoinj.script;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.bitcoinj.base.Sha256Hash;
import org.bitcoinj.base.internal.ByteUtils; import org.bitcoinj.base.internal.ByteUtils;
import org.bitcoinj.crypto.DumpedPrivateKey; import org.bitcoinj.crypto.DumpedPrivateKey;
import org.bitcoinj.crypto.ECKey; import org.bitcoinj.crypto.ECKey;
@ -112,4 +113,55 @@ public class ScriptPatternTest {
byte[] p2shScriptHash = ScriptPattern.extractHashFromP2SH(p2shScript); byte[] p2shScriptHash = ScriptPattern.extractHashFromP2SH(p2shScript);
assertEquals("defdb71910720a2c854529019189228b4245eddd", ByteUtils.formatHex(p2shScriptHash)); assertEquals("defdb71910720a2c854529019189228b4245eddd", ByteUtils.formatHex(p2shScriptHash));
} }
@Test
public void isWitnessCommitment() {
// OP_RETURN <1-byte length 36> <4-byte commitment header> <32 bytes commitment>
String hex = "6a24aa21a9ed0000000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
assertTrue(ScriptPattern.isWitnessCommitment(script));
assertEquals(Sha256Hash.ZERO_HASH, ScriptPattern.extractWitnessCommitmentHash(script));
}
@Test
public void isWitnessCommitment_tooShort() {
// OP_RETURN <1-byte length 35> <4-byte commitment header> <31 bytes commitment>
String hex = "6a23aa21a9ed00000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
assertFalse(ScriptPattern.isWitnessCommitment(script));
}
@Test
public void isWitnessCommitment_tooLong() {
// OP_RETURN <1-byte length 37> <4-byte commitment header> <33 bytes commitment>
String hex = "6a25aa21a9ed000000000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
assertFalse(ScriptPattern.isWitnessCommitment(script));
}
@Test
public void isWitnessCommitment_noOpReturn() {
// OP_NOP <1-byte length 36> <4-byte commitment header> <32 bytes commitment>
String hex = "6124aa21a9ed0000000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
assertFalse(ScriptPattern.isWitnessCommitment(script));
}
@Test
public void isWitnessCommitment_wrongCommitmentHeader() {
// OP_RETURN <1-byte length 36> <4-byte commitment header> <32 bytes commitment>
String hex = "6a24ffffffff0000000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
assertFalse(ScriptPattern.isWitnessCommitment(script));
}
@Test
public void extractWitnessCommitmentHash() {
// OP_RETURN <1-byte length 36> <4-byte commitment header> <32 bytes commitment>
String hex = "6a24aa21a9ed0000000000000000000000000000000000000000000000000000000000000000";
Script script = Script.parse(ByteUtils.parseHex(hex));
Sha256Hash hash = ScriptPattern.extractWitnessCommitmentHash(script);
assertEquals("0000000000000000000000000000000000000000000000000000000000000000",
ByteUtils.formatHex(hash.getBytes()));
}
} }