mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-24 22:58:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add Wallet.maybeCommitTx to not throw when tx is already in pending

Browse source
This commit is contained in:
Matt Corallo 2013-06-14 14:19:06 +02:00 • committed by Mike Hearn
parent 74110a12d9
commit 5f1a9c246b
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/src/main/java/com/google/bitcoin/core/Wallet.java
View file

@ -1360,21 +1360,16 @@ public class Wallet implements Serializable, BlockChainListener {
}
/**
* <p>Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs
* the onCoinsSent/onCoinsReceived event listener. Used in two situations:</p>
* Calls {@link Wallet#commitTx} if tx is not already in the pending pool
*
* <ol>
* <li>When we have just successfully transmitted the tx we created to the network.</li>
* <li>When we receive a pending transaction that didn't appear in the chain yet, and we did not create it.</li>
* </ol>
*
* <p>Triggers an auto save.</p>
* @return true if the tx was added to the wallet, or false if it was already in the pending pool
*/
public void commitTx(Transaction tx) throws VerificationException {
public boolean maybeCommitTx(Transaction tx) throws VerificationException {
tx.verify();
lock.lock();
try {
checkArgument(!pending.containsKey(tx.getHash()), "commitTx called on the same transaction twice");
if (pending.containsKey(tx.getHash()))
return false;
log.info("commitTx of {}", tx.getHashAsString());
BigInteger balance = getBalance();
tx.setUpdateTime(Utils.now());
@ -1408,6 +1403,22 @@ public class Wallet implements Serializable, BlockChainListener {
} finally {
lock.unlock();
}
return true;
}
/**
* <p>Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs
* the onCoinsSent/onCoinsReceived event listener. Used in two situations:</p>
*
* <ol>
* <li>When we have just successfully transmitted the tx we created to the network.</li>
* <li>When we receive a pending transaction that didn't appear in the chain yet, and we did not create it.</li>
* </ol>
*
* <p>Triggers an auto save.</p>
*/
public void commitTx(Transaction tx) throws VerificationException {
checkArgument(maybeCommitTx(tx), "commitTx called on the same transaction twice");
}
/**