LN: pass ln node config arguments in from graphml file

Author: pinheadmz

src/schema/node_schema.json

@@ -12,8 +12,9 @@
     "collect_logs": {"type": "boolean", "default": false},
     "build_args": {"type": "string", "default": ""},
     "ln": {"type": "string"},
-    "ln-image": {"type": "string"},
-    "ln-cb-image": {"type": "string"}
+    "ln_image": {"type": "string"},
+    "ln_cb_image": {"type": "string"},
+    "ln_config": {"type": "string"}
   },
   "additionalProperties": false,
   "oneOf": [

src/warnet/lnnode.py

@@ -16,16 +16,14 @@
 ])
 
 class LNNode:
-    def __init__(self, warnet, tank, impl, image, backend: BackendInterface, cb=None):
+    def __init__(self, warnet, tank, backend: BackendInterface, options):
         self.warnet = warnet
         self.tank = tank
-        assert impl == "lnd"
-        self.impl = impl
-        self.image = "lightninglabs/lnd:v0.17.0-beta"
-        if image:
-            self.image = image
         self.backend = backend
-        self.cb = cb
+        self.impl = options["impl"]
+        self.image = options["ln_image"]
+        self.cb = options["cb_image"]
+        self.ln_config = options["ln_config"]
         self.ipv4 = generate_ipv4_addr(self.warnet.subnet)
         self.rpc_port = 10009
 
@@ -53,6 +51,7 @@ def get_conf(self, ln_container_name, tank_container_name) -> str:
             conf += f" --alias={self.tank.index}"
             conf += f" --externalhosts={ln_container_name}"
             conf += f" --tlsextradomain={ln_container_name}"
+            conf += " " + self.ln_config
             return conf
         return ""
 

src/warnet/tank.py

@@ -87,12 +87,13 @@ def parse_graph_node(self, node):
 
         # Special handling for complex properties
         if "ln" in node:
-            impl = node["ln"]
-            image = node.get("ln-image", None)
-            cb_image = node.get("ln-cb-image", None)
-            self.lnnode = LNNode(
-                self.warnet, self, impl, image, self.warnet.container_interface, cb_image
-            )
+            options = {
+                "impl": node["ln"],
+                "ln_image": node.get("ln_image", "lightninglabs/lnd:v0.17.0-beta"),
+                "cb_image": node.get("ln_cb_image", None),
+                "ln_config": node.get("ln_config", "")
+            }
+            self.lnnode = LNNode(self.warnet, self, self.warnet.container_interface, options)
 
         logger.debug(
             f"Parsed graph node: {self.index} with attributes: {[f'{key}={value}' for key, value in graph_properties.items()]}"

test/data/ln.graphml

@@ -3,8 +3,9 @@
   <key attr.name="bitcoin_config" attr.type="string" for="node" id="bitcoin_config"/>
   <key attr.name="tc_netem"       attr.type="string" for="node" id="tc_netem"/>
   <key attr.name="ln"             attr.type="string" for="node" id="ln"/>
-  <key attr.name="ln-image"       attr.type="string" for="node" id="ln-image"/>
-  <key attr.name="ln-cb-image"    attr.type="string" for="node" id="ln-cb-image"/>
+  <key attr.name="ln_image"       attr.type="string" for="node" id="ln_image"/>
+  <key attr.name="ln_cb_image"    attr.type="string" for="node" id="ln_cb_image"/>
+  <key attr.name="ln_config"      attr.type="string" for="node" id="ln_config"/>
   <key attr.name="channel"        attr.type="string" for="edge" id="channel"/>
   <key attr.name="collect_logs"   attr.type="boolean" for="node" id="collect_logs"/>
   <key attr.name="image"          attr.type="string" for="node" id="image"/>
@@ -19,15 +20,16 @@
         <data key="version">26.0</data>
         <data key="bitcoin_config">-uacomment=w1</data>
         <data key="ln">lnd</data>
-        <data key="ln-image">lightninglabs/lnd:v0.15.5-beta</data>
-        <data key="ln-cb-image">pinheadmz/circuitbreaker:278737d</data>
+        <data key="ln_image">lightninglabs/lnd:v0.15.5-beta</data>
+        <data key="ln_cb_image">pinheadmz/circuitbreaker:278737d</data>
         <data key="collect_logs">true</data>
+        <data key="ln_config">--bitcoin.timelockdelta=20</data>
     </node>
     <node id="2">
         <data key="version">26.0</data>
         <data key="bitcoin_config">-uacomment=w2</data>
         <data key="ln">lnd</data>
-        <data key="ln-cb-image">pinheadmz/circuitbreaker:278737d</data>
+        <data key="ln_cb_image">pinheadmz/circuitbreaker:278737d</data>
     </node>
     <node id="3">
         <data key="version">26.0</data>

test/ln_test.py

@@ -44,6 +44,13 @@ def get_cb_forwards(index):
 base.warcli("scenarios run ln_init")
 base.wait_for_all_scenarios()
 
+print("\nEnsuring channel policy settings")
+chans = json.loads(base.warcli("lncli 1 describegraph"))["edges"]
+for chan in chans:
+    # node_1 or node_2 is tank 1 with its non-default --bitcoin.timelockdelta=20
+    if chan["node1_policy"]["time_lock_delta"] != 20:
+        assert chan["node2_policy"]["time_lock_delta"] == 20
+
 print("\nEnsuring no circuit breaker forwards yet")
 assert len(get_cb_forwards(1)["forwards"]) == 0
 
@@ -55,17 +62,13 @@ def get_cb_forwards(index):
 print(base.warcli(f"lncli 0 payinvoice -f {inv}"))
 
 print("Waiting for payment success")
-
-
 def check_invoices():
     invs = json.loads(base.warcli("lncli 2 listinvoices"))["invoices"]
     if len(invs) > 0 and invs[0]["state"] == "SETTLED":
         print("\nSettled!")
         return True
     else:
         return False
-
-
 base.wait_for_predicate(check_invoices)
 
 print("\nEnsuring circuit breaker tracked payment")