sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-26 18:16:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle adding non witness inputs to segwit transactions

Browse source
This commit is contained in:
Craig Raw 2020-07-24 10:09:24 +02:00
parent 70d0b7afcd
commit 0466755883
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/sparrowwallet/drongo/protocol/Transaction.java
View file

@ -307,7 +307,11 @@ public class Transaction extends ChildMessage {
} }
public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Script script) { public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Script script) {
return addInput(new TransactionInput(this, new TransactionOutPoint(spendTxHash, outputIndex), script.getProgram())); if(isSegwit()) {
return addInput(spendTxHash, outputIndex, script, new TransactionWitness(this));
} else {
return addInput(new TransactionInput(this, new TransactionOutPoint(spendTxHash, outputIndex), script.getProgram()));
}
} }
public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Script script, TransactionWitness witness) { public TransactionInput addInput(Sha256Hash spendTxHash, long outputIndex, Script script, TransactionWitness witness) {

4
src/main/java/com/sparrowwallet/drongo/protocol/TransactionWitness.java
View file

@ -33,6 +33,10 @@ public class TransactionWitness extends ChildMessage {
pushes.add(witnessScript.getProgram()); pushes.add(witnessScript.getProgram());
} }
public TransactionWitness(Transaction transaction) {
this(transaction, new ArrayList<>());
}
public TransactionWitness(Transaction transaction, List<byte[]> witnesses) { public TransactionWitness(Transaction transaction, List<byte[]> witnesses) {
setParent(transaction); setParent(transaction);
this.pushes = witnesses; this.pushes = witnesses;

2
src/main/java/com/sparrowwallet/drongo/psbt/PSBT.java
View file

@ -484,7 +484,7 @@ public class PSBT {
if(psbtInput.getFinalScriptWitness() != null) { if(psbtInput.getFinalScriptWitness() != null) {
txInput.setWitness(psbtInput.getFinalScriptWitness()); txInput.setWitness(psbtInput.getFinalScriptWitness());
} else { } else {
txInput.setWitness(new TransactionWitness(transaction, Collections.emptyList())); txInput.setWitness(new TransactionWitness(transaction));
} }
} }
} }