mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add block explorer tx as hex request using completeable future api

Browse Source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-02 23:03:55 -05:00
parent 7f5675f054
commit 0388c7c88a
No known key found for this signature in database
GPG Key ID: 02AA2BAE387C8307
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/bisq/core/provider/MempoolHttpClient.java
View File

@ -27,6 +27,8 @@ import javax.inject.Singleton;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import javax.annotation.Nullable;
@Singleton
@ -42,4 +44,18 @@ public class MempoolHttpClient extends HttpClientImpl {
String api = "/" + txId;
return get(api, "User-Agent", "bisq/" + Version.VERSION);
}
public CompletableFuture<String> requestTxAsHex(String txId) {
super.shutDown(); // close any prior incomplete request
return CompletableFuture.supplyAsync(() -> {
String api = "/" + txId + "/hex";
try {
return get(api, "User-Agent", "bisq/" + Version.VERSION);
} catch (IOException e) {
throw new RuntimeException(e);
}
});
}
}

8
core/src/main/java/bisq/core/provider/mempool/MempoolRequest.java
View File

@ -34,6 +34,7 @@ import com.google.common.util.concurrent.SettableFuture;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
import lombok.extern.slf4j.Slf4j;
@ -66,12 +67,19 @@ public class MempoolRequest {
log.info("Received mempoolData of [{}] from provider", mempoolData);
mempoolServiceCallback.set(mempoolData);
}
public void onFailure(@NotNull Throwable throwable) {
mempoolServiceCallback.setException(throwable);
}
}, MoreExecutors.directExecutor());
}
public CompletableFuture<String> requestTxAsHex(String txId) {
mempoolHttpClient.setBaseUrl(getRandomServiceAddress(txBroadcastServices));
return mempoolHttpClient.requestTxAsHex(txId);
}
public boolean switchToAnotherProvider() {
txBroadcastServices.remove(mempoolHttpClient.getBaseUrl());
return txBroadcastServices.size() > 0;

8
core/src/main/java/bisq/core/provider/mempool/MempoolService.java
View File

@ -43,6 +43,7 @@ import com.google.common.util.concurrent.SettableFuture;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import lombok.Getter;
@ -129,7 +130,12 @@ public class MempoolService {
mempoolRequest.getTxStatus(future, txId);
}
// ///////////////////////////
public CompletableFuture<String> requestTxAsHex(String txId) {
outstandingRequests++;
return new MempoolRequest(preferences, socks5ProxyProvider)
.requestTxAsHex(txId)
.whenComplete((result, throwable) -> outstandingRequests--);
}
private void validateOfferMakerTx(MempoolRequest mempoolRequest,
TxValidator txValidator,