Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-30 23:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Add a Wallet.notifyTransactionIsInBlock(Sha256Hash txHash...)

Browse Source
This commit is contained in:
Matt Corallo 2012-12-23 17:44:18 -05:00
parent 661ad3cb04
commit 289c3d19f0
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/com/google/bitcoin/core/BlockChainListener.java
View File

@ -61,4 +61,15 @@ public interface BlockChainListener {
*/
void receiveFromBlock(Transaction tx, StoredBlock block,
BlockChain.NewBlockType blockType) throws VerificationException;
/**
* <p>Called by the {@link BlockChain} when we receive a new filtered block that contains the given transaction
* hash in its merkle tree.</p>
*
* <p>A transaction may be received multiple times if is included into blocks in parallel chains. The blockType
* parameter describes whether the containing block is on the main/best chain or whether it's on a presently
* inactive side chain.</p>
*/
void notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block,
BlockChain.NewBlockType blockType) throws VerificationException;
}

26
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -613,6 +613,32 @@ public class Wallet implements Serializable, BlockChainListener {
BlockChain.NewBlockType blockType) throws VerificationException {
receive(tx, block, blockType, false);
}
/**
* Called by the {@link BlockChain} when we receive a new filtered block that contains a transactions previously
* received by a call to @{link receivePending}.<p>
*
* This is necessary for the internal book-keeping Wallet does. When a transaction is received that sends us
* coins it is added to a pool so we can use it later to create spends. When a transaction is received that
* consumes outputs they are marked as spent so they won't be used in future.<p>
*
* A transaction that spends our own coins can be received either because a spend we created was accepted by the
* network and thus made it into a block, or because our keys are being shared between multiple instances and
* some other node spent the coins instead. We still have to know about that to avoid accidentally trying to
* double spend.<p>
*
* A transaction may be received multiple times if is included into blocks in parallel chains. The blockType
* parameter describes whether the containing block is on the main/best chain or whether it's on a presently
* inactive side chain. We must still record these transactions and the blocks they appear in because a future
* block might change which chain is best causing a reorganize. A re-org can totally change our balance!
*/
public synchronized void notifyTransactionIsInBlock(Sha256Hash txHash, StoredBlock block,
BlockChain.NewBlockType blockType) throws VerificationException {
Transaction tx = pending.get(txHash);
if (tx == null)
return;
receive(tx, block, blockType, false);
}
/**
* Called when we have found a transaction (via network broadcast or otherwise) that is relevant to this wallet