mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-19 18:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a number of issues with message length caching.

Browse Source
This commit is contained in:
Matt Corallo 2012-08-13 23:30:01 +02:00 committed by Mike Hearn
parent deb9da67aa
commit f2d9a6162d
5 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/google/bitcoin/core/Block.java
View File

@ -739,7 +739,7 @@ public class Block extends Message {
else if (transactions.size() > 0 && t.isCoinBase())
throw new RuntimeException("Attempted to add a coinbase transaction when there already is one: " + t);
transactions.add(t);
adjustLength(t.length);
adjustLength(transactions.size(), t.length);
// Force a recalculation next time the values are needed.
merkleRoot = null;
hash = null;
@ -842,6 +842,9 @@ public class Block extends Message {
coinbase.addInput(new TransactionInput(params, coinbase, new byte[]{(byte) txCounter++}));
coinbase.addOutput(new TransactionOutput(params, coinbase, Script.createOutputScript(pubKeyTo)));
transactions.add(coinbase);
coinbase.setParent(this);
coinbase.length = coinbase.bitcoinSerialize().length;
adjustLength(transactions.size(), coinbase.length);
}
static final byte[] EMPTY_BYTES = new byte[32];

11
core/src/main/java/com/google/bitcoin/core/ChildMessage.java
View File

@ -72,12 +72,15 @@ public abstract class ChildMessage extends Message {
if (parent != null)
parent.unCache();
}
protected void adjustLength(int adjustment) {
if (length != UNKNOWN_LENGTH)
length += adjustment;
adjustLength(0, adjustment);
}
protected void adjustLength(int newArraySize, int adjustment) {
super.adjustLength(newArraySize, adjustment);
if (parent != null)
parent.adjustLength(adjustment);
parent.adjustLength(newArraySize, adjustment);
}
}

20
core/src/main/java/com/google/bitcoin/core/Message.java
View File

@ -36,7 +36,7 @@ public abstract class Message implements Serializable {
public static final int MAX_SIZE = 0x02000000;
public static final int UNKNOWN_LENGTH = -1;
public static final int UNKNOWN_LENGTH = Integer.MIN_VALUE;
// Useful to ensure serialize/deserialize are consistent with each other.
private static final boolean SELF_CHECK = false;
@ -221,10 +221,20 @@ public abstract class Message implements Serializable {
recached = false;
}
protected void adjustLength(int adjustment) {
if (length != UNKNOWN_LENGTH)
// Our own length is now unknown if we have an unknown length adjustment.
length = adjustment == UNKNOWN_LENGTH ? UNKNOWN_LENGTH : length + adjustment;
protected void adjustLength(int newArraySize, int adjustment) {
if (length == UNKNOWN_LENGTH)
return;
// Our own length is now unknown if we have an unknown length adjustment.
if (adjustment == UNKNOWN_LENGTH) {
length = UNKNOWN_LENGTH;
return;
}
length += adjustment;
// Check if we will need more bytes to encode the length prefix.
if (newArraySize == 1)
length++; // The assumption here is we never call adjustLength with the same arraySize as before.
else if (newArraySize != 0)
length += VarInt.sizeOf(newArraySize) - VarInt.sizeOf(newArraySize - 1);
}
/**

8
core/src/main/java/com/google/bitcoin/core/Transaction.java
View File

@ -83,7 +83,7 @@ public class Transaction extends ChildMessage implements Serializable {
inputs = new ArrayList<TransactionInput>();
outputs = new ArrayList<TransactionOutput>();
// We don't initialize appearsIn deliberately as it's only useful for transactions stored in the wallet.
length = 10; // 8 for std fields + 1 for each 0 varint
length = 8; // 8 for std fields
}
public Transaction(NetworkParameters params, int version, Sha256Hash hash) {
@ -93,7 +93,7 @@ public class Transaction extends ChildMessage implements Serializable {
outputs = new ArrayList<TransactionOutput>();
this.hash = hash;
// We don't initialize appearsIn deliberately as it's only useful for transactions stored in the wallet.
length = 10; //8 for std fields + 1 for each 0 varint
length = 8; //8 for std fields
}
/**
@ -609,7 +609,7 @@ public class Transaction extends ChildMessage implements Serializable {
unCache();
input.setParent(this);
inputs.add(input);
adjustLength(input.length);
adjustLength(inputs.size(), input.length);
}
/**
@ -619,7 +619,7 @@ public class Transaction extends ChildMessage implements Serializable {
unCache();
to.setParent(this);
outputs.add(to);
adjustLength(to.length);
adjustLength(outputs.size(), to.length);
}
/**

33
core/src/test/java/com/google/bitcoin/core/BlockTest.java
View File

@ -149,4 +149,37 @@ public class BlockTest {
// of this test is to ensure no errors occur during the Java serialization/deserialization process.
assertEquals(tx, tx2);
}
@Test
public void testUpdateLength() {
NetworkParameters params = NetworkParameters.unitTests();
Block block = params.genesisBlock.createNextBlockWithCoinbase(new ECKey().getPubKey());
assertEquals(block.bitcoinSerialize().length, block.length);
final int origBlockLen = block.length;
Transaction tx = new Transaction(params);
// this is broken until the transaction has > 1 input + output (which is required anyway...)
//assertTrue(tx.length == tx.bitcoinSerialize().length && tx.length == 8);
byte[] outputScript = new byte[10];
Arrays.fill(outputScript, (byte)Script.OP_FALSE);
tx.addOutput(new TransactionOutput(params, null, BigInteger.valueOf(1), outputScript));
tx.addInput(new TransactionInput(params, null, new byte[] {(byte)Script.OP_FALSE},
new TransactionOutPoint(params, 0, Sha256Hash.create(new byte[] {1}))));
int origTxLength = 8 + 2 + 8 + 1 + 10 + 40 + 1 + 1;
assertEquals(tx.bitcoinSerialize().length, tx.length);
assertEquals(origTxLength, tx.length);
block.addTransaction(tx);
assertEquals(block.bitcoinSerialize().length, block.length);
assertEquals(origBlockLen + tx.length, block.length);
block.getTransactions().get(1).getInputs().get(0).setScriptBytes(new byte[] {(byte)Script.OP_FALSE, (byte)Script.OP_FALSE});
assertEquals(block.length, origBlockLen + tx.length);
assertEquals(tx.length, origTxLength + 1);
block.getTransactions().get(1).getInputs().get(0).setScriptBytes(new byte[] {});
assertEquals(block.length, block.bitcoinSerialize().length);
assertEquals(block.length, origBlockLen + tx.length);
assertEquals(tx.length, origTxLength - 1);
block.getTransactions().get(1).addInput(new TransactionInput(params, null, new byte[] {(byte)Script.OP_FALSE},
new TransactionOutPoint(params, 0, Sha256Hash.create(new byte[] {1}))));
assertEquals(block.length, origBlockLen + tx.length);
assertEquals(tx.length, origTxLength + 41); // - 1 + 40 + 1 + 1
}
}