mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-22 06:21:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

PartialMerkleTree: make immutable

Browse source
This commit is contained in:
Andreas Schildbach 2023-04-11 17:27:49 +02:00
parent cd75c6ab6b
commit 0401a0cde2
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/src/main/java/org/bitcoinj/core/PartialMerkleTree.java
View file

@ -62,18 +62,16 @@ import static org.bitcoinj.base.internal.ByteUtils.writeInt32LE;
* - byte[] flag bits, packed per 8 in a byte, least significant bit first (<= 2*N-1 bits)
* </pre>
* <p>The size constraints follow from this.</p>
*
* <p>Instances of this class are not safe for use by multiple threads.</p>
*/
public class PartialMerkleTree {
// the total number of transactions in the block
private int transactionCount;
// node-is-parent-of-matched-txid bits
private byte[] matchedChildBits;
private final int transactionCount;
// txids and internal hashes
private List<Sha256Hash> hashes;
private final List<Sha256Hash> hashes;
// node-is-parent-of-matched-txid bits
private final byte[] matchedChildBits;
/**
* Deserialize a partial merkle tree from a given payload.
@ -89,18 +87,17 @@ public class PartialMerkleTree {
for (int i = 0; i < nHashes; i++)
hashes.add(Sha256Hash.read(payload));
byte[] matchedChildBits = Buffers.readLengthPrefixedBytes(payload);
return new PartialMerkleTree(matchedChildBits, hashes, transactionCount);
return new PartialMerkleTree(transactionCount, hashes, matchedChildBits);
}
/**
* Constructs a new PMT with the given bit set (little endian) and the raw list of hashes including internal hashes,
* taking ownership of the list.
*/
public PartialMerkleTree(byte[] bits, List<Sha256Hash> hashes, int origTxCount) {
super();
this.matchedChildBits = bits;
this.hashes = hashes;
public PartialMerkleTree(int origTxCount, List<Sha256Hash> hashes, byte[] bits) {
this.transactionCount = origTxCount;
this.hashes = Objects.requireNonNull(hashes);
this.matchedChildBits = Objects.requireNonNull(bits);
}
/**
@ -119,7 +116,7 @@ public class PartialMerkleTree {
for (int i = 0; i < bitList.size(); i++)
if (bitList.get(i))
ByteUtils.setBitLE(bits, i);
return new PartialMerkleTree(bits, hashes, allLeafHashes.size());
return new PartialMerkleTree(allLeafHashes.size(), hashes, bits);
}
/**

2
core/src/test/java/org/bitcoinj/core/PartialMerkleTreeTest.java
View file

@ -56,7 +56,7 @@ public class PartialMerkleTreeTest {
byte[] randomHash = new byte[Sha256Hash.LENGTH];
return Sha256Hash.wrap(randomHash);
}).limit(random.nextInt(10)).collect(Collectors.toList());
return new PartialMerkleTree(randomBits, hashes, random.nextInt(20));
return new PartialMerkleTree(random.nextInt(20), hashes, randomBits);
}).limit(10).iterator();
}
}

2
integration-test/src/test/java/org/bitcoinj/core/FilteredBlockAndPartialMerkleTreeTest.java
View file

@ -234,7 +234,7 @@ public class FilteredBlockAndPartialMerkleTreeTest extends TestWithPeerGroup {
hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000001"));
hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000002"));
hashes.add(Sha256Hash.wrap("0000000000000000000000000000000000000000000000000000000000000003"));
PartialMerkleTree pmt = new PartialMerkleTree(bits, hashes, 3) {
PartialMerkleTree pmt = new PartialMerkleTree(3, hashes, bits) {
public ByteBuffer write(ByteBuffer buf) throws BufferOverflowException {
writeInt32LE(getTransactionCount(), buf);
// Add Integer.MAX_VALUE instead of hashes.size()