highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-28 22:53:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adds mempool to verify OTS via Tor.

Browse Source
This commit is contained in:
Vitor Pamplona
2024-09-26 15:23:00 -04:00
parent ff9f25ccdb
commit c7b7ad78b7
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
amethyst/src/main/java/com/vitorpamplona/amethyst/service/ots/OkHttpBlockstreamExplorer.kt
View File

@@ -48,7 +48,8 @@ class OkHttpBlockstreamExplorer(
return it return it
} }
val url = "$BLOCKSTREAM_API_URL/block/$hash" val usingTor = forceProxy(BLOCKSTREAM_API_URL)
val url = "${getAPI(usingTor)}/block/$hash"
val client = HttpClientManager.getHttpClient(forceProxy(url)) val client = HttpClientManager.getHttpClient(forceProxy(url))
val request = val request =
@@ -92,8 +93,9 @@ class OkHttpBlockstreamExplorer(
return it return it
} }
val url = "$BLOCKSTREAM_API_URL/block-height/$height" val usingTor = forceProxy(BLOCKSTREAM_API_URL)
val client = HttpClientManager.getHttpClient(forceProxy(url)) val url = "${getAPI(usingTor)}/block-height/$height"
val client = HttpClientManager.getHttpClient(usingTor)
val request = val request =
Request Request
@@ -119,5 +121,13 @@ class OkHttpBlockstreamExplorer(
companion object { companion object {
private const val BLOCKSTREAM_API_URL = "https://blockstream.info/api" private const val BLOCKSTREAM_API_URL = "https://blockstream.info/api"
private const val MEMPOOL_API_URL = "https://mempool.space/api/"
fun getAPI(usingTor: Boolean) =
if (usingTor) {
MEMPOOL_API_URL
} else {
BLOCKSTREAM_API_URL
}
} }
} }

2
quartz/src/main/java/com/vitorpamplona/quartz/ots/OpenTimestamps.java
View File

@@ -379,8 +379,8 @@ public class OpenTimestamps {
try { try {
String blockHash = explorer.blockHash(height); String blockHash = explorer.blockHash(height);
blockInfo = explorer.block(blockHash);
Log.i("OpenTimestamps", "Lite-client verification, assuming block " + blockHash + " is valid"); Log.i("OpenTimestamps", "Lite-client verification, assuming block " + blockHash + " is valid");
blockInfo = explorer.block(blockHash);
} catch (Exception e2) { } catch (Exception e2) {
e2.printStackTrace(); e2.printStackTrace();
throw e2; throw e2;