crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Revert "Removed getWalletTransactions() synchronization. Again, can be re-added later."

Browse Source 
This reverts commit 70c864bc2f.
This commit is contained in:
CalDescent 2022-02-09 19:46:16 +00:00
parent dda2316884
commit b7b66f6cba
1 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/crosschain/Bitcoiny.java
View File

@ -342,6 +342,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
} }
public List<SimpleTransaction> getWalletTransactions(String key58) throws ForeignBlockchainException { public List<SimpleTransaction> getWalletTransactions(String key58) throws ForeignBlockchainException {
synchronized (this) {
Context.propagate(bitcoinjContext); Context.propagate(bitcoinjContext);
Wallet wallet = walletFromDeterministicKey58(key58); Wallet wallet = walletFromDeterministicKey58(key58);
@ -408,6 +409,7 @@ public abstract class Bitcoiny implements ForeignBlockchain {
.map(t -> convertToSimpleTransaction(t, keySet)) .map(t -> convertToSimpleTransaction(t, keySet))
.sorted(newestTimestampFirstComparator).collect(Collectors.toList()); .sorted(newestTimestampFirstComparator).collect(Collectors.toList());
} }
}
protected SimpleTransaction convertToSimpleTransaction(BitcoinyTransaction t, Set<String> keySet) { protected SimpleTransaction convertToSimpleTransaction(BitcoinyTransaction t, Set<String> keySet) {
long amount = 0; long amount = 0;