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

finalize psbt with tx input outpoint

Browse source
This commit is contained in:
Craig Raw 2020-07-28 08:30:42 +02:00
parent 15beeefcb6
commit 3ce2394813
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -647,14 +647,29 @@ public class Wallet {
int threshold = getDefaultPolicy().getNumSignaturesRequired(); int threshold = getDefaultPolicy().getNumSignaturesRequired();
Map<PSBTInput, WalletNode> signingNodes = getSigningNodes(psbt); Map<PSBTInput, WalletNode> signingNodes = getSigningNodes(psbt);
for(PSBTInput psbtInput : psbt.getPsbtInputs()) { for(int i = 0; i < psbt.getTransaction().getInputs().size(); i++) {
WalletNode signingNode = signingNodes.get(psbtInput); TransactionInput txInput = psbt.getTransaction().getInputs().get(i);
TransactionOutput utxo = psbtInput.getUtxo(); PSBTInput psbtInput = psbt.getPsbtInputs().get(i);
if(psbtInput.getPartialSignatures().size() >= threshold && signingNode != null && utxo != null) { WalletNode signingNode = signingNodes.get(psbtInput);
//Transaction parent on PSBT utxo might be null in a witness tx, so get utxo tx hash and utxo index from PSBT tx input
TransactionOutput utxo = new TransactionOutput(null, psbtInput.getUtxo().getValue(), psbtInput.getUtxo().getScript()) {
@Override
public Sha256Hash getHash() {
return txInput.getOutpoint().getHash();
}
@Override
public int getIndex() {
return (int)txInput.getOutpoint().getIndex();
}
};
if(psbtInput.getPartialSignatures().size() >= threshold && signingNode != null) {
Transaction transaction = new Transaction(); Transaction transaction = new Transaction();
TransactionInput txInput; TransactionInput finalizedTxInput;
if(getPolicyType().equals(PolicyType.SINGLE)) { if(getPolicyType().equals(PolicyType.SINGLE)) {
ECKey pubKey = getPubKey(signingNode); ECKey pubKey = getPubKey(signingNode);
TransactionSignature transactionSignature = psbtInput.getPartialSignature(pubKey); TransactionSignature transactionSignature = psbtInput.getPartialSignature(pubKey);
@ -662,7 +677,7 @@ public class Wallet {
throw new IllegalArgumentException("Pubkey of partial signature does not match wallet pubkey"); throw new IllegalArgumentException("Pubkey of partial signature does not match wallet pubkey");
} }
txInput = getScriptType().addSpendingInput(transaction, utxo, pubKey, transactionSignature); finalizedTxInput = getScriptType().addSpendingInput(transaction, utxo, pubKey, transactionSignature);
} else if(getPolicyType().equals(PolicyType.MULTI)) { } else if(getPolicyType().equals(PolicyType.MULTI)) {
List<ECKey> pubKeys = getPubKeys(signingNode); List<ECKey> pubKeys = getPubKeys(signingNode);
List<TransactionSignature> signatures = pubKeys.stream().map(psbtInput::getPartialSignature).collect(Collectors.toList()); List<TransactionSignature> signatures = pubKeys.stream().map(psbtInput::getPartialSignature).collect(Collectors.toList());
@ -670,13 +685,13 @@ public class Wallet {
throw new IllegalArgumentException("Pubkeys of partial signatures do not match wallet pubkeys"); throw new IllegalArgumentException("Pubkeys of partial signatures do not match wallet pubkeys");
} }
txInput = getScriptType().addMultisigSpendingInput(transaction, utxo, threshold, pubKeys, signatures); finalizedTxInput = getScriptType().addMultisigSpendingInput(transaction, utxo, threshold, pubKeys, signatures);
} else { } else {
throw new UnsupportedOperationException("Cannot finalise PSBT for policy type " + getPolicyType()); throw new UnsupportedOperationException("Cannot finalise PSBT for policy type " + getPolicyType());
} }
psbtInput.setFinalScriptSig(txInput.getScriptSig()); psbtInput.setFinalScriptSig(finalizedTxInput.getScriptSig());
psbtInput.setFinalScriptWitness(txInput.getWitness()); psbtInput.setFinalScriptWitness(finalizedTxInput.getWitness());
psbtInput.clearFinalised(); psbtInput.clearFinalised();
} }
} }