Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-29 09:48:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add value to inputs

Browse source
This commit is contained in:
Manfred Karrer 2015-03-16 00:28:49 +01:00
parent 12b130cbd0
commit 32db4c0c75
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/io/bitsquare/btc/WalletService.java
View file

@ -703,7 +703,7 @@ public class WalletService {
// Add all inputs from offerer (normally its just 1 input) // Add all inputs from offerer (normally its just 1 input)
for (TransactionOutput connectedOutputForInput : offererConnectedOutputsForAllInputs) { for (TransactionOutput connectedOutputForInput : offererConnectedOutputsForAllInputs) {
TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction()); TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
TransactionInput transactionInput = new TransactionInput(params, depositTx, new byte[]{}, outPoint); TransactionInput transactionInput = new TransactionInput(params, depositTx, new byte[]{}, outPoint, connectedOutputForInput.getValue());
depositTx.addInput(transactionInput); depositTx.addInput(transactionInput);
} }
@ -756,7 +756,7 @@ public class WalletService {
// Add all inputs from offerer (normally its just 1 input) // Add all inputs from offerer (normally its just 1 input)
for (TransactionOutput connectedOutputForInput : offererConnectedOutputsForAllInputs) { for (TransactionOutput connectedOutputForInput : offererConnectedOutputsForAllInputs) {
TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction()); TransactionOutPoint outPoint = new TransactionOutPoint(params, connectedOutputForInput.getIndex(), connectedOutputForInput.getParentTransaction());
TransactionInput input = new TransactionInput(params, depositTx, new byte[]{}, outPoint); TransactionInput input = new TransactionInput(params, depositTx, new byte[]{}, outPoint, connectedOutputForInput.getValue());
offererInputs.add(input); offererInputs.add(input);
depositTx.addInput(input); depositTx.addInput(input);
} }
@ -772,7 +772,7 @@ public class WalletService {
TransactionInput signedInput = result.get(); TransactionInput signedInput = result.get();
Script script = signedInput.getScriptSig(); Script script = signedInput.getScriptSig();
TransactionInput transactionInput = new TransactionInput(params, depositTx, script.getProgram(), outPoint); TransactionInput transactionInput = new TransactionInput(params, depositTx, script.getProgram(), outPoint, connectedOutputForInput.getValue());
depositTx.addInput(transactionInput); depositTx.addInput(transactionInput);
} }
} }
@ -796,6 +796,7 @@ public class WalletService {
verifyTransaction(depositTx); verifyTransaction(depositTx);
checkWalletConsistency(); checkWalletConsistency();
checkScriptSigForAllInputs(depositTx);
// Broadcast depositTx // Broadcast depositTx
log.trace("Wallet balance before broadcastTransaction: " + wallet.getBalance()); log.trace("Wallet balance before broadcastTransaction: " + wallet.getBalance());
@ -1027,12 +1028,12 @@ public class WalletService {
} }
} }
/* private void checkScriptSigForAllInputs(Transaction transaction) throws TransactionVerificationException { private void checkScriptSigForAllInputs(Transaction transaction) throws TransactionVerificationException {
int inputIndex = 0; int inputIndex = 0;
for (TransactionInput input : transaction.getInputs()) { for (TransactionInput input : transaction.getInputs()) {
checkScriptSig(transaction, input, inputIndex); checkScriptSig(transaction, input, inputIndex);
} }
}*/ }
private void removeSignatures(Transaction transaction) throws InsufficientMoneyException { private void removeSignatures(Transaction transaction) throws InsufficientMoneyException {
for (TransactionInput input : transaction.getInputs()) { for (TransactionInput input : transaction.getInputs()) {