sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 13:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check if locking script is p2sh, fix output reference bug

Browse source
This commit is contained in:
Craig Raw 2020-06-14 14:00:37 +02:00
parent 09c4a01ca4
commit 51b2608abc
4 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 75701c725d00a11f7a3931190d029378a04be8f6
Subproject commit 601c11bd50405cc781bc35f8c680ba4c5e48ae91

20
src/main/java/com/sparrowwallet/sparrow/io/ElectrumServer.java
View file

@ -228,7 +228,21 @@ public class ElectrumServer {
for(Integer index : result.keySet()) {
ScriptHashTx[] txes = result.get(index);
Set<BlockTransactionHash> references = Arrays.stream(txes).map(ScriptHashTx::getBlockchainTransactionHash).filter(ref -> !ref.getHash().equals(transaction.getTxId())).collect(Collectors.toCollection(TreeSet::new));
int txBlockHeight = 0;
Optional<BlockTransactionHash> optionalTxHash = Arrays.stream(txes)
.map(ScriptHashTx::getBlockchainTransactionHash)
.filter(ref -> ref.getHash().equals(transaction.getTxId()))
.findFirst();
if(optionalTxHash.isPresent()) {
txBlockHeight = optionalTxHash.get().getHeight();
}
final int minBlockHeight = txBlockHeight;
Set<BlockTransactionHash> references = Arrays.stream(txes)
.map(ScriptHashTx::getBlockchainTransactionHash)
.filter(ref -> !ref.getHash().equals(transaction.getTxId()) && ref.getHeight() >= minBlockHeight)
.collect(Collectors.toCollection(TreeSet::new));
blockTransactionHashes.set(index, references);
}
@ -934,9 +948,9 @@ public class ElectrumServer {
} else {
BlockTransaction blockTransaction = transactionMap.get(reference.getHash());
for(TransactionInput input : blockTransaction.getTransaction().getInputs()) {
if(input.getOutpoint().getHash().equals(transaction.getTxId())) {
if(input.getOutpoint().getHash().equals(transaction.getTxId()) && input.getOutpoint().getIndex() == i) {
if(blockTransactions.set(i, blockTransaction) != null) {
throw new IllegalStateException("Double spend detected on hash " + reference.getHash());
throw new IllegalStateException("Double spend detected for output #" + i + " on hash " + reference.getHash());
}
}
}

9
src/main/java/com/sparrowwallet/sparrow/transaction/InputController.java
View file

@ -214,8 +214,15 @@ public class InputController extends TransactionFormController implements Initia
}
private void initializeScriptFields(TransactionInput txInput, PSBTInput psbtInput) {
//TODO: Is this safe?
//TODO: While we immediately check if the referenced transaction output is P2SH, where this is not present getting the first nested script is not safe
Script redeemScript = txInput.getScriptSig().getFirstNestedScript();
if(redeemScript != null && inputForm.getReferencedTransactionOutput() != null) {
Script lockingScript = inputForm.getReferencedTransactionOutput().getScript();
if(!ScriptType.P2SH.isScriptType(lockingScript)) {
redeemScript = null;
}
}
if(redeemScript == null && psbtInput != null && psbtInput.getRedeemScript() != null) {
addPSBTDecoration(redeemScriptArea, "PSBT Redeem Script", "non-final");
redeemScript = psbtInput.getRedeemScript();

13
src/main/java/com/sparrowwallet/sparrow/transaction/InputForm.java
View file

@ -2,9 +2,11 @@ package com.sparrowwallet.sparrow.transaction;
import com.sparrowwallet.drongo.protocol.Transaction;
import com.sparrowwallet.drongo.protocol.TransactionInput;
import com.sparrowwallet.drongo.protocol.TransactionOutput;
import com.sparrowwallet.drongo.psbt.PSBT;
import com.sparrowwallet.drongo.psbt.PSBTInput;
import com.sparrowwallet.drongo.wallet.BlockTransaction;
import com.sparrowwallet.sparrow.io.ElectrumServer;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
@ -38,6 +40,17 @@ public class InputForm extends TransactionForm {
return psbtInput;
}
public TransactionOutput getReferencedTransactionOutput() {
if(getInputTransactions() != null) {
BlockTransaction inputTransaction = getInputTransactions().get(transactionInput.getOutpoint().getHash());
if(inputTransaction != null && !inputTransaction.equals(ElectrumServer.UNFETCHABLE_BLOCK_TRANSACTION)) {
return inputTransaction.getTransaction().getOutputs().get((int)transactionInput.getOutpoint().getIndex());
}
}
return null;
}
@Override
public Node getContents() throws IOException {
FXMLLoader loader = new FXMLLoader(getClass().getResource("input.fxml"));