signer: Update canned messages for registration

Author: cdecker

Taskfile.yml

@@ -34,7 +34,7 @@ tasks:
       - task: testing:check
       - task: clnvm:check
 
-  docker-ci-check:
+  docker-ci-build:
     cmds:
       - >
         docker buildx build \
@@ -47,9 +47,19 @@ tasks:
           -t gltesting \
           -f docker/gl-testing/Dockerfile \
           .
-      - docker run -ti -v $(pwd):/repo gltesting task ci-check
+    
+  docker-ci-check:
+    deps:
+#      - docker-ci-build
+    cmds:
+      - docker run --rm -ti -v $(pwd):/repo gltesting task ci-check
 
   ci-build:
     cmds:
       - task: signerproxy:build
       - task: plugin:build
+  clean:
+    dir: "."
+    cmds:
+      - cargo clean
+      - rm -rf .venv

libs/gl-client-py/.tasks.yml

@@ -1,9 +1,17 @@
 version: '3'
 
 tasks:
+  force-install:
+    dir: "."
+    cmds:
+      # Forces a reinstall of the latest version
+      - uv run maturin develop  
+  
   check:
     env:
       PYTEST_OPTS: "-vvv"
+    deps:
+      - force-install
     cmds:
       - uv run pytest tests $PYTEST_OPTS
 

libs/gl-client-py/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gl-client"
-version = "0.3.2"
+version = "0.3.2rc1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.8"

libs/gl-client/src/signer/mod.rs

@@ -270,26 +270,8 @@ impl Signer {
             dev_bip32_seed: None,
             dev_channel_secrets: None,
             dev_channel_secrets_shaseed: None,
-            hsm_wire_min_version: 5,
-            hsm_wire_max_version: 5,
-        })
-    }
-
-    fn bolt12initreq() -> vls_protocol::msgs::Message {
-        vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
-            info: Octets("bolt12-invoice-base".as_bytes().to_vec()),
-        })
-    }
-
-    fn scbinitreq() -> vls_protocol::msgs::Message {
-        vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
-            info: Octets("scb secret".as_bytes().to_vec()),
-        })
-    }
-
-    fn commandoinitreq() -> vls_protocol::msgs::Message {
-        vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
-            info: Octets("commando".as_bytes().to_vec()),
+            hsm_wire_min_version: 4,
+            hsm_wire_max_version: 6,
         })
     }
 
@@ -642,11 +624,24 @@ impl Signer {
         let requests = vec![
             // v22.11 introduced an addiotiona startup message, the
             // bolt12 key generation
-            Signer::bolt12initreq(),
+            vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
+                info: Octets("bolt12-invoice-base".as_bytes().to_vec()),
+            }),
             // SCB needs a secret derived too
-            Signer::scbinitreq(),
+            vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
+                info: Octets("scb secret".as_bytes().to_vec()),
+            }),
             // Commando needs a secret for its runes
-            Signer::commandoinitreq(),
+            vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
+                info: Octets("commando".as_bytes().to_vec()),
+            }),
+            // The node alias key
+            vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
+                info: Octets("node-alias-base".as_bytes().to_vec()),
+            }),
+            vls_protocol::msgs::Message::DeriveSecret(vls_protocol::msgs::DeriveSecret {
+                info: Octets("offer-blinded-path".as_bytes().to_vec()),
+            }),
         ];
 
         let serialized: Vec<Vec<u8>> = requests.iter().map(|m| m.inner().as_vec()).collect();

libs/gl-testing/gltesting/node.py

@@ -92,11 +92,11 @@ def __init__(
             '--disable-plugin=cln-grpc',
             f'--subdaemon=hsmd:{signerproxy_path}',
             f'--important-plugin={plugin_path}',
-            '--dev-bitcoind-poll=5',
-            '--dev-fast-gossip',
+            #'--dev-bitcoind-poll=5',
+            #'--dev-fast-gossip',
             '--offline',
-            '--experimental-anchors',
-            '--developer',  # TODO Make this multi-version capable
+            #'--experimental-anchors',
+            #'--developer',  # TODO Make this multi-version capable
         ]
 
     def write_node_config(self, network: str):

libs/gl-testing/gltesting/scheduler.py

@@ -136,6 +136,8 @@ def get_node(self, node_id):
         for n in self.nodes:
             if n.node_id == node_id:
                 return n
+        from rich.pretty import pprint
+        pprint(self.nodes)
         raise ValueError(
             f"No node with node_id={node_id} found in gltesting scheduler, do you need to register it first?"
         )
@@ -264,7 +266,7 @@ async def Recover(self, req):
 
     async def Schedule(self, req):
         n = self.get_node(req.node_id)
-
+        print("XXX", n)
         # If already running we just return the existing binding
         if n.process:
             return schedpb.NodeInfoResponse(
@@ -274,7 +276,7 @@ async def Schedule(self, req):
 
         node_version = n.signer_version.get_node_version()
         node_version = self.versions.get(node_version, None)
-
+        print("XXX", node_version)
         logging.debug(
             f"Determined that we need to start node_version={node_version} for n.signer_version={n.signer_version}"
         )
@@ -284,41 +286,48 @@ async def Schedule(self, req):
                 f"No node_version found for n.signer_version={n.signer_version}"
             )
 
-        # Otherwise we need to start a new process
-        n.process = NodeProcess(
-            node_id=req.node_id,
-            init_msg=n.initmsg,
-            directory=n.directory,
-            network=n.network,
-            identity=n.identity,
-            version=node_version,
-            bitcoind=self.bitcoind,
-            startupmsgs=n.startupmsgs,
-        )
-        n.process.write_node_config(n.network)
-        n.process.start()
-
-        with n.condition:
-            n.condition.notify_all()
-
-        # Wait for the grpc port to be accessible
-        start_time = time.perf_counter()
-        timeout = 10
-        while True:
-            try:
-                with socket.create_connection(
-                    ("localhost", n.process.grpc_port), timeout=0.1
-                ):
-                    break
-            except Exception:
-                time.sleep(0.01)
-                if time.perf_counter() - start_time >= timeout:
-                    raise TimeoutError(
-                        f"Waited too for port localhost:{n.process.grpc_port} to become reachable"
-                    )
-        # TODO Actually wait for the port to be accessible
-        time.sleep(1)
-
+        print("XXX","Starting")
+        try:
+            # Otherwise we need to start a new process
+            n.process = NodeProcess(
+                node_id=req.node_id,
+                init_msg=n.initmsg,
+                directory=n.directory,
+                network=n.network,
+                identity=n.identity,
+                version=node_version,
+                bitcoind=self.bitcoind,
+                startupmsgs=n.startupmsgs,
+            )
+            n.process.write_node_config(n.network)
+            n.process.start()
+
+            # Wait for the grpc port to be accessible
+            start_time = time.perf_counter()
+            timeout = 10
+            print("Waiting for node to become reachable")
+            while True:
+                try:
+                    print("Pinging")
+                    with socket.create_connection(
+                        ("localhost", n.process.grpc_port), timeout=0.1
+                    ):
+                        print("Successfully connected to grpc port")
+                        break
+                except Exception:
+                    print("Failed to contact grpc port, sleeping")
+                    time.sleep(0.1)
+                    if time.perf_counter() - start_time >= timeout:
+                        raise TimeoutError(
+                            f"Waited too for port localhost:{n.process.grpc_port} to become reachable"
+                        )
+            # TODO Actually wait for the port to be accessible
+            time.sleep(1)
+            with n.condition:
+                n.condition.notify_all()
+        except Exception as e:
+            print(e)
+            raise e
         return schedpb.NodeInfoResponse(
             node_id=n.node_id,
             grpc_uri=n.process.grpc_uri,