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

TransactionOutput: make field scriptBytes immutable

Browse source
This commit is contained in:
Andreas Schildbach 2025-02-05 16:32:16 +01:00
parent acd0faaec7
commit b237a34d8b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/java/org/bitcoinj/core/Transaction.java
View file

@ -1387,8 +1387,9 @@ public class Transaction extends BaseMessage {
BigInteger.valueOf(output.getValue().getValue()), BigInteger.valueOf(output.getValue().getValue()),
bosHashOutputs bosHashOutputs
); );
bosHashOutputs.write(VarInt.of(output.getScriptBytes().length).serialize()); byte[] scriptBytes = output.getScriptBytes();
bosHashOutputs.write(output.getScriptBytes()); bosHashOutputs.write(VarInt.of(scriptBytes.length).serialize());
bosHashOutputs.write(scriptBytes);
} }
hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray()); hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray());
} else if (basicSigHashType == SigHash.SINGLE.value && inputIndex < outputs.size()) { } else if (basicSigHashType == SigHash.SINGLE.value && inputIndex < outputs.size()) {
@ -1397,8 +1398,9 @@ public class Transaction extends BaseMessage {
BigInteger.valueOf(this.outputs.get(inputIndex).getValue().getValue()), BigInteger.valueOf(this.outputs.get(inputIndex).getValue().getValue()),
bosHashOutputs bosHashOutputs
); );
bosHashOutputs.write(VarInt.of(this.outputs.get(inputIndex).getScriptBytes().length).serialize()); byte[] scriptBytes = this.outputs.get(inputIndex).getScriptBytes();
bosHashOutputs.write(this.outputs.get(inputIndex).getScriptBytes()); bosHashOutputs.write(VarInt.of(scriptBytes.length).serialize());
bosHashOutputs.write(scriptBytes);
hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray()); hashOutputs = Sha256Hash.hashTwice(bosHashOutputs.toByteArray());
} }
writeInt32LE(version, bos); writeInt32LE(version, bos);

4
core/src/main/java/org/bitcoinj/core/TransactionOutput.java
View file

@ -61,7 +61,7 @@ public class TransactionOutput {
// A transaction output has a script used for authenticating that the redeemer is allowed to spend // A transaction output has a script used for authenticating that the redeemer is allowed to spend
// this output. // this output.
private byte[] scriptBytes; private final byte[] scriptBytes;
// The script bytes are parsed and turned into a Script on demand. // The script bytes are parsed and turned into a Script on demand.
private Script scriptPubKey; private Script scriptPubKey;
@ -308,7 +308,7 @@ public class TransactionOutput {
* @return the scriptBytes * @return the scriptBytes
*/ */
public byte[] getScriptBytes() { public byte[] getScriptBytes() {
return scriptBytes; return Arrays.copyOf(scriptBytes, scriptBytes.length);
} }
/** /**