SatSale

commit 981a7b256a80c010c296799a4c1010478a57339a
parent bcc1a46eba47c8d98013919b4b672b921666e95c
Author: Nick <nicholas.w.farrow@gmail.com>
Date:   Tue, 10 Aug 2021 02:47:23 +1000

rpc over tor hidden service for bitcoind (#14)

* rpc over tor hidden service for bitcoind

* Do not load tor if we arent using it!

* remove unhelpful requirement
Diffstat:
M
config.py
 | 
2
++
A
gateways/tor.py
 | 
21
+++++++++++++++++++++
M
pay/bitcoind.py
 | 
64
++++++++++++++++++++++++++++++++++++++++++++++++++++++----------

3 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/config.py b/config.py
@@ -20,6 +20,8 @@ api_key_path = "SatSale_API_key"
 # This forwards the ports required to talk to the node via RPC (or gRPC in the case of lightning)
 # Use host = "127.0.0.1" and you will be able to see your node on 8332
 tunnel_host = None  # "HOST@IP"
+# OR TOR HIDDEN SERVICE TO RPC
+tor_bitcoinrpc_host = None
 
 # Check for payment every xx seconds
 pollrate = 15
diff --git a/gateways/tor.py b/gateways/tor.py
@@ -0,0 +1,21 @@
+import socks
+import json
+import requests
+import time
+
+import config
+
+time.sleep(3)
+
+print("Using tor proxies {}:{}".format("localhost", 9050))
+session = requests.session()
+session.proxies = {
+    "http": "socks5h://localhost:9050",
+    "https": "socks5h://localhost:9050",
+}
+
+print(
+    "Checking tor circuit IP address... You should check this is different to your IP."
+)
+r = session.get("http://httpbin.org/ip")
+print(r.text)
diff --git a/pay/bitcoind.py b/pay/bitcoind.py
@@ -1,27 +1,62 @@
 import time
 import uuid
 import qrcode
+import json
 
 import config
 from invoice.price_feed import get_btc_value
 
+if config.tor_bitcoinrpc_host is not None:
+    from gateways.tor import session
+
+
+def call_tor_bitcoin_rpc(method, params):
+    url = "{}:{}".format(config.tor_bitcoinrpc_host, config.rpcport)
+    payload = json.dumps({"method": method, "params": params})
+    headers = {"content-type": "application/json", "cache-control": "no-cache"}
+    response = session.request(
+        "POST",
+        url,
+        data=payload,
+        headers=headers,
+        auth=(config.username, config.password),
+    )
+    return json.loads(response.text)
+
 
 class btcd:
     def __init__(self):
         from bitcoinrpc.authproxy import AuthServiceProxy
 
-        connection_str = "http://{}:{}@{}:{}/wallet/{}".format(
-            config.username, config.password, config.host, config.rpcport, config.wallet
-        )
-        print("Attempting to connect to {}.".format(connection_str))
-
         for i in range(config.connection_attempts):
+            if config.tor_bitcoinrpc_host is None:
+                self.tor = False
+                connection_str = "http://{}:{}@{}:{}/wallet/{}".format(
+                    config.username,
+                    config.password,
+                    config.host,
+                    config.rpcport,
+                    config.wallet,
+                )
+                print("Attempting to connect to {}.".format(connection_str))
+            else:
+                self.tor = True
+                print(
+                    "Attempting to contact bitcoind rpc tor hidden service: {}:{}".format(
+                        config.tor_bitcoinrpc_host, config.rpcport
+                    )
+                )
+
             try:
-                self.rpc = AuthServiceProxy(connection_str)
+                # Normal Connection
+                if config.tor_bitcoinrpc_host is None:
+                    self.rpc = AuthServiceProxy(connection_str)
+                    info = self.rpc.getblockchaininfo()
+                # Tor Connection
+                else:
+                    info = call_tor_bitcoin_rpc("getblockchaininfo", None)
 
-                info = self.rpc.getblockchaininfo()
                 print(info)
-
                 print("Successfully contacted bitcoind.")
                 break
 
@@ -47,7 +82,11 @@ class btcd:
         return
 
     def check_payment(self, address):
-        transactions = self.rpc.listtransactions()
+        if not self.tor:
+            transactions = self.rpc.listtransactions()
+        else:
+            transactions = call_tor_bitcoin_rpc("listtransactions", None)["result"]
+
         relevant_txs = [tx for tx in transactions if tx["address"] == address]
 
         conf_paid = 0
@@ -63,8 +102,13 @@ class btcd:
     def get_address(self, amount, label):
         for i in range(config.connection_attempts):
             try:
-                address = self.rpc.getnewaddress(label)
+                if not self.tor:
+                    address = self.rpc.getnewaddress(label)
+                else:
+                    address = call_tor_bitcoin_rpc("getnewaddress", [label])["result"]
+
                 return address, None
+
             except Exception as e:
                 print(e)
                 print(