Skip to content

Commit ec3295c

Browse files
committed
Remove additional code for mempool.space support since their API changed and is now the same as Esplora
1 parent efdc9bb commit ec3295c

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

sauron/sauron.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,6 @@ def init(plugin, options, **kwargs):
4646
raise SauronError("You need to specify the sauron-api-endpoint option.")
4747
sys.exit(1)
4848

49-
# Testing for Esplora or mempool.space API
50-
try:
51-
# MutinyNet API
52-
feerate_url = "{}/v1/fees/recommended".format(plugin.api_endpoint)
53-
feerate_req = fetch(feerate_url)
54-
assert feerate_req.status_code == 200
55-
plugin.is_mempoolspace = True
56-
except AssertionError:
57-
# Esplora API
58-
plugin.is_mempoolspace = False
59-
6049
if options["sauron-tor-proxy"]:
6150
address, port = options["sauron-tor-proxy"].split(":")
6251
socks5_proxy = "socks5h://{}:{}".format(address, port)
@@ -66,7 +55,7 @@ def init(plugin, options, **kwargs):
6655
}
6756
plugin.log("Using proxy {} for requests".format(socks5_proxy))
6857

69-
api = "mempool.space" if plugin.is_mempoolspace else "Esplora"
58+
api = "mempool.space" if "mutinynet.com" in plugin.api_endpoint else "Esplora"
7059
plugin.log(f"Sauron plugin initialized using {api} API")
7160
plugin.log(sauron_eye)
7261

@@ -200,12 +189,7 @@ def getutxout(plugin, txid, vout, **kwargs):
200189

201190
@plugin.method("estimatefees")
202191
def estimatefees(plugin, **kwargs):
203-
if plugin.is_mempoolspace:
204-
# MutinyNet API
205-
feerate_url = "{}/v1/fees/recommended".format(plugin.api_endpoint)
206-
else:
207-
# Blockstream API
208-
feerate_url = "{}/fee-estimates".format(plugin.api_endpoint)
192+
feerate_url = "{}/fee-estimates".format(plugin.api_endpoint)
209193

210194
feerate_req = fetch(feerate_url)
211195
assert feerate_req.status_code == 200

0 commit comments

Comments
 (0)