Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 10:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Transaction: Rename parameters redeemScript and connectedScript to scriptCode in witness signature methods.

Browse Source
This commit is contained in:
Andreas Schildbach 2019-02-02 16:33:16 +01:00
parent a5fd9c6848
commit c8caff20cd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@ -1186,33 +1186,33 @@ public class Transaction extends ChildMessage {
public TransactionSignature calculateWitnessSignature( public TransactionSignature calculateWitnessSignature(
int inputIndex, int inputIndex,
ECKey key, ECKey key,
byte[] redeemScript, byte[] scriptCode,
Coin value, Coin value,
SigHash hashType, SigHash hashType,
boolean anyoneCanPay) { boolean anyoneCanPay) {
Sha256Hash hash = hashForSignatureWitness(inputIndex, redeemScript, value, hashType, anyoneCanPay); Sha256Hash hash = hashForSignatureWitness(inputIndex, scriptCode, value, hashType, anyoneCanPay);
return new TransactionSignature(key.sign(hash), hashType, anyoneCanPay); return new TransactionSignature(key.sign(hash), hashType, anyoneCanPay);
} }
public TransactionSignature calculateWitnessSignature( public TransactionSignature calculateWitnessSignature(
int inputIndex, int inputIndex,
ECKey key, ECKey key,
Script redeemScript, Script scriptCode,
Coin value, Coin value,
SigHash hashType, SigHash hashType,
boolean anyoneCanPay) { boolean anyoneCanPay) {
return calculateWitnessSignature(inputIndex, key, redeemScript.getProgram(), value, hashType, anyoneCanPay); return calculateWitnessSignature(inputIndex, key, scriptCode.getProgram(), value, hashType, anyoneCanPay);
} }
public TransactionSignature calculateWitnessSignature( public TransactionSignature calculateWitnessSignature(
int inputIndex, int inputIndex,
ECKey key, ECKey key,
@Nullable KeyParameter aesKey, @Nullable KeyParameter aesKey,
byte[] redeemScript, byte[] scriptCode,
Coin value, Coin value,
SigHash hashType, SigHash hashType,
boolean anyoneCanPay) { boolean anyoneCanPay) {
Sha256Hash hash = hashForSignatureWitness(inputIndex, redeemScript, value, hashType, anyoneCanPay); Sha256Hash hash = hashForSignatureWitness(inputIndex, scriptCode, value, hashType, anyoneCanPay);
return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay); return new TransactionSignature(key.sign(hash, aesKey), hashType, anyoneCanPay);
} }
@ -1220,11 +1220,11 @@ public class Transaction extends ChildMessage {
int inputIndex, int inputIndex,
ECKey key, ECKey key,
@Nullable KeyParameter aesKey, @Nullable KeyParameter aesKey,
Script redeemScript, Script scriptCode,
Coin value, Coin value,
SigHash hashType, SigHash hashType,
boolean anyoneCanPay) { boolean anyoneCanPay) {
return calculateWitnessSignature(inputIndex, key, aesKey, redeemScript.getProgram(), value, hashType, anyoneCanPay); return calculateWitnessSignature(inputIndex, key, aesKey, scriptCode.getProgram(), value, hashType, anyoneCanPay);
} }
public synchronized Sha256Hash hashForSignatureWitness( public synchronized Sha256Hash hashForSignatureWitness(
@ -1263,7 +1263,7 @@ public class Transaction extends ChildMessage {
public synchronized Sha256Hash hashForSignatureWitness( public synchronized Sha256Hash hashForSignatureWitness(
int inputIndex, int inputIndex,
byte[] connectedScript, byte[] scriptCode,
Coin prevValue, Coin prevValue,
byte sigHashType){ byte sigHashType){
ByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(length == UNKNOWN_LENGTH ? 256 : length + 4); ByteArrayOutputStream bos = new UnsafeByteArrayOutputStream(length == UNKNOWN_LENGTH ? 256 : length + 4);
@ -1318,7 +1318,7 @@ public class Transaction extends ChildMessage {
bos.write(hashSequence); bos.write(hashSequence);
bos.write(inputs.get(inputIndex).getOutpoint().getHash().getReversedBytes()); bos.write(inputs.get(inputIndex).getOutpoint().getHash().getReversedBytes());
uint32ToByteStreamLE(inputs.get(inputIndex).getOutpoint().getIndex(), bos); uint32ToByteStreamLE(inputs.get(inputIndex).getOutpoint().getIndex(), bos);
bos.write(connectedScript); bos.write(scriptCode);
uint64ToByteStreamLE(BigInteger.valueOf(prevValue.getValue()), bos); uint64ToByteStreamLE(BigInteger.valueOf(prevValue.getValue()), bos);
uint32ToByteStreamLE(inputs.get(inputIndex).getSequenceNumber(), bos); uint32ToByteStreamLE(inputs.get(inputIndex).getSequenceNumber(), bos);
bos.write(hashOutputs); bos.write(hashOutputs);