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

Add a getTransactions() method that returns a set of all transactions, optionally including those which are dead and inactive. Add an argument for returning dead transactions in getRecentTransactions(). Updates issue 3.

Browse Source
This commit is contained in:
Mike Hearn 2011-09-18 21:08:39 +00:00
parent 5f2029e21b
commit 03647dbb7e
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/com/google/bitcoin/core/Wallet.java
View File

@ -436,30 +436,45 @@ public class Wallet implements Serializable {
pending.put(tx.getHash(), tx); pending.put(tx.getHash(), tx);
} }
/** Returns all transactions in the wallet ordered by recency. See {@link Wallet#getRecentTransactions(int)}. */ /**
* Returns a set of all transactions in the wallet.
*
* @param includeDead If true, transactions that were overridden by a double spend are included.
* @param includeInactive If true, transactions that are on side chains (are unspendable) are included.
*/
public Set<Transaction> getTransactions(boolean includeDead, boolean includeInactive) {
Set<Transaction> all = new HashSet<Transaction>();
all.addAll(unspent.values());
all.addAll(spent.values());
all.addAll(pending.values());
if (includeDead)
all.addAll(dead.values());
if (includeInactive)
all.addAll(inactive.values());
return all;
}
/** Returns all non-dead, active transactions ordered by recency. */
public List<Transaction> getTransactionsByTime() { public List<Transaction> getTransactionsByTime() {
return getRecentTransactions(0); return getRecentTransactions(0, false);
} }
/** /**
* Returns an list of N transactions, ordered by increasing age. Transactions which exist only on * Returns an list of N transactions, ordered by increasing age. Transactions on side chains are not included.
* inactive side-chains are not included or which are dead (overridden by double spends) are not included.<p> * Dead transactions (overridden by double spends) are optionally included. <p>
* *
* Note: the current implementation is O(num transactions in wallet). Regardless of how many transactions are * Note: the current implementation is O(num transactions in wallet). Regardless of how many transactions are
* requested, the cost is always the same. In future, requesting smaller numbers of transactions may be faster * requested, the cost is always the same. In future, requesting smaller numbers of transactions may be faster
* depending on how the wallet is implemented (eg if backed by a database). * depending on how the wallet is implemented (eg if backed by a database).
*/ */
public List<Transaction> getRecentTransactions(int numTransactions) { public List<Transaction> getRecentTransactions(int numTransactions, boolean includeDead) {
assert numTransactions >= 0; assert numTransactions >= 0;
// Firstly, put all transactions into an array. // Firstly, put all transactions into an array.
int size = getPoolSize(Pool.UNSPENT) + getPoolSize(Pool.SPENT) + getPoolSize(Pool.PENDING); int size = getPoolSize(Pool.UNSPENT) + getPoolSize(Pool.SPENT) + getPoolSize(Pool.PENDING);
if (numTransactions > size || numTransactions == 0) { if (numTransactions > size || numTransactions == 0) {
numTransactions = size; numTransactions = size;
} }
ArrayList<Transaction> all = new ArrayList<Transaction>(size); ArrayList<Transaction> all = new ArrayList<Transaction>(getTransactions(includeDead, false));
all.addAll(unspent.values());
all.addAll(spent.values());
all.addAll(pending.values());
// Order by date. // Order by date.
Collections.sort(all, Collections.reverseOrder(new Comparator<Transaction>() { Collections.sort(all, Collections.reverseOrder(new Comparator<Transaction>() {
public int compare(Transaction t1, Transaction t2) { public int compare(Transaction t1, Transaction t2) {

2
tests/com/google/bitcoin/core/WalletTest.java
View File

@ -292,7 +292,7 @@ public class WalletTest {
assertEquals(tx1, transactions.get(1)); assertEquals(tx1, transactions.get(1));
assertEquals(2, transactions.size()); assertEquals(2, transactions.size());
// Check we get only the last transaction if we request a subrage. // Check we get only the last transaction if we request a subrage.
transactions = wallet.getRecentTransactions(1); transactions = wallet.getRecentTransactions(1, false);
assertEquals(1, transactions.size()); assertEquals(1, transactions.size());
assertEquals(tx2, transactions.get(0)); assertEquals(tx2, transactions.get(0));