Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 14:07:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make all addOutputs and addInputs return the newly added in/output.

Browse Source
This commit is contained in:
Matt Corallo
2013-06-11 11:06:26 +02:00
committed by Mike Hearn
parent 5f1a9c246b
commit 63be9b705b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/main/java/com/google/bitcoin/core/Transaction.java
View File

@@ -663,22 +663,21 @@ public class Transaction extends ChildMessage implements Serializable {
* Adds an input to this transaction that imports value from the given output. Note that this input is NOT
* complete and after every input is added with addInput() and every output is added with addOutput(),
* signInputs() must be called to finalize the transaction and finish the inputs off. Otherwise it won't be
* accepted by the network.
* accepted by the network. Returns the newly created input.
*/
public TransactionInput addInput(TransactionOutput from) {
final TransactionInput input = new TransactionInput(params, this, from);
addInput(input);
return input;
return addInput(new TransactionInput(params, this, from));
}
/**
* Adds an input directly, with no checking that it's valid.
* Adds an input directly, with no checking that it's valid. Returns the new input.
*/
public void addInput(TransactionInput input) {
public TransactionInput addInput(TransactionInput input) {
unCache();
input.setParent(this);
inputs.add(input);
adjustLength(inputs.size(), input.length);
return input;
}
/**
@@ -696,36 +695,37 @@ public class Transaction extends ChildMessage implements Serializable {
}
/**
* Adds the given output to this transaction. The output must be completely initialized.
* Adds the given output to this transaction. The output must be completely initialized. Returns the given output.
*/
public void addOutput(TransactionOutput to) {
public TransactionOutput addOutput(TransactionOutput to) {
unCache();
to.setParent(this);
outputs.add(to);
adjustLength(outputs.size(), to.length);
return to;
}
/**
* Creates an output based on the given address and value, adds it to this transaction.
* Creates an output based on the given address and value, adds it to this transaction, and returns the new output.
*/
public void addOutput(BigInteger value, Address address) {
addOutput(new TransactionOutput(params, this, value, address));
public TransactionOutput addOutput(BigInteger value, Address address) {
return addOutput(new TransactionOutput(params, this, value, address));
}
/**
* Creates an output that pays to the given pubkey directly (no address) with the given value, and adds it to this
* transaction.
* Creates an output that pays to the given pubkey directly (no address) with the given value, adds it to this
* transaction, and returns the new output.
*/
public void addOutput(BigInteger value, ECKey pubkey) {
addOutput(new TransactionOutput(params, this, value, pubkey));
public TransactionOutput addOutput(BigInteger value, ECKey pubkey) {
return addOutput(new TransactionOutput(params, this, value, pubkey));
}
/**
* Creates an output that pays to the given script. The address and key forms are specialisations of this method,
* you won't normally need to use it unless you're doing unusual things.
*/
public void addOutput(BigInteger value, Script script) {
addOutput(new TransactionOutput(params, this, value, script.getProgram()));
public TransactionOutput addOutput(BigInteger value, Script script) {
return addOutput(new TransactionOutput(params, this, value, script.getProgram()));
}
/**