Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-14 11:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix exceptions for no CLN nodes

Browse Source
This commit is contained in:
Reckless_Satoshi 2023-05-25 04:19:45 -07:00
parent 5d5435e7a1
commit 067ba38668
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/lightning/cln.py
View File

@ -19,17 +19,18 @@ from . import primitives_pb2 as primitives__pb2
####### #######
# Load the client's certificate and key # Load the client's certificate and key
with open(os.path.join(config("CLN_DIR"), "client.pem"), "rb") as f: CLN_DIR = config("CLN_DIR", cast=str, default="/cln/testnet/")
with open(os.path.join(CLN_DIR, "client.pem"), "rb") as f:
client_cert = f.read() client_cert = f.read()
with open(os.path.join(config("CLN_DIR"), "client-key.pem"), "rb") as f: with open(os.path.join(CLN_DIR, "client-key.pem"), "rb") as f:
client_key = f.read() client_key = f.read()
# Load the server's certificate # Load the server's certificate
with open(os.path.join(config("CLN_DIR"), "server.pem"), "rb") as f: with open(os.path.join(CLN_DIR, "server.pem"), "rb") as f:
server_cert = f.read() server_cert = f.read()
CLN_GRPC_HOST = config("CLN_GRPC_HOST") CLN_GRPC_HOST = config("CLN_GRPC_HOST", cast=str, default="localhost:9999")
DISABLE_ONCHAIN = config("DISABLE_ONCHAIN", cast=bool, default=True) DISABLE_ONCHAIN = config("DISABLE_ONCHAIN", cast=bool, default=True)
MAX_SWAP_AMOUNT = config("MAX_SWAP_AMOUNT", cast=int, default=500000) MAX_SWAP_AMOUNT = config("MAX_SWAP_AMOUNT", cast=int, default=500000)

8
api/lightning/node.py
View File

@ -1,16 +1,16 @@
from decouple import config from decouple import config
LN_vendor = config("LNVENDOR", cast=str, default="LND") LNVENDOR = config("LNVENDOR", cast=str, default="LND")
if LN_vendor == "LND": if LNVENDOR == "LND":
from api.lightning.lnd import LNDNode from api.lightning.lnd import LNDNode
LNNode = LNDNode LNNode = LNDNode
elif LN_vendor == "CLN": elif LNVENDOR == "CLN":
from api.lightning.cln import CLNNode from api.lightning.cln import CLNNode
LNNode = CLNNode LNNode = CLNNode
else: else:
raise ValueError( raise ValueError(
f'Invalid Lightning Node vendor: {LN_vendor}. Must be either "LND" or "CLN"' f'Invalid Lightning Node vendor: {LNVENDOR}. Must be either "LND" or "CLN"'
) )

17
api/utils.py
View File

@ -14,6 +14,7 @@ logger = logging.getLogger("api.utils")
TOR_PROXY = config("TOR_PROXY", default="127.0.0.1:9050") TOR_PROXY = config("TOR_PROXY", default="127.0.0.1:9050")
USE_TOR = config("USE_TOR", cast=bool, default=True) USE_TOR = config("USE_TOR", cast=bool, default=True)
LNVENDOR = config("LNVENDOR", cast=str, default="LND")
def get_session(): def get_session():
@ -144,10 +145,12 @@ lnd_version_cache = {}
@ring.dict(lnd_version_cache, expire=3600) @ring.dict(lnd_version_cache, expire=3600)
def get_lnd_version(): def get_lnd_version():
try:
from api.lightning.lnd import LNDNode
from api.lightning.lnd import LNDNode return LNDNode.get_version()
except Exception:
return LNDNode.get_version() return None
cln_version_cache = {} cln_version_cache = {}
@ -155,10 +158,12 @@ cln_version_cache = {}
@ring.dict(cln_version_cache, expire=3600) @ring.dict(cln_version_cache, expire=3600)
def get_cln_version(): def get_cln_version():
try:
from api.lightning.cln import CLNNode
from api.lightning.cln import CLNNode return CLNNode.get_version()
except Exception:
return CLNNode.get_version() return None
robosats_commit_cache = {} robosats_commit_cache = {}