Revert "Upgrade cln-* crates"

Cargo.toml

@@ -22,9 +22,9 @@ members = [
 [workspace.dependencies]
 anyhow = "1"
 env_logger = "0.10"
-cln-grpc = "0.1.9"
-cln-rpc = "0.1.9"
-cln-plugin = "0.1.9"
+cln-grpc = "=0.1.8"
+cln-rpc = "0.1.8"
+cln-plugin = "0.1.8"
 
 vls-core = "^0.11.0"
 vls-persist = "^0.11.0"

libs/gl-client-py/glclient/rpc.py

@@ -282,6 +282,19 @@ def del_datastore(
             bytes(self.inner.call(uri, bytes(req)))
         )
 
+    def del_expired_invoice(
+            self,
+            maxexpirytime=None
+    ):
+        uri = "/cln.Node/DelExpiredInvoice"
+        req = clnpb.DelexpiredinvoiceRequest(
+            maxexpirytime=maxexpirytime
+        ).SerializeToString()
+        res = clnpb.DelexpiredinvoiceResponse
+        return res.FromString(
+            bytes(self.inner.call(uri, bytes(req)))
+        )
+
     def del_invoice(
             self,
             label,

libs/gl-client/src/signer/model/cln.rs

@@ -24,6 +24,7 @@ pub fn decode_request(uri: &str, p: &[u8]) -> anyhow::Result<Request> {
 	"/cln.Node/Datastore" => Request::Datastore(DatastoreRequest::decode(p)?),
 	"/cln.Node/CreateOnion" => Request::CreateOnion(CreateonionRequest::decode(p)?),
 	"/cln.Node/DelDatastore" => Request::DelDatastore(DeldatastoreRequest::decode(p)?),
+	"/cln.Node/DelExpiredInvoice" => Request::DelExpiredInvoice(DelexpiredinvoiceRequest::decode(p)?),
 	"/cln.Node/DelInvoice" => Request::DelInvoice(DelinvoiceRequest::decode(p)?),
 	"/cln.Node/Invoice" => Request::Invoice(InvoiceRequest::decode(p)?),
 	"/cln.Node/ListDatastore" => Request::ListDatastore(ListdatastoreRequest::decode(p)?),

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

@@ -38,6 +38,7 @@ pub enum Request {
     Datastore(cln::DatastoreRequest),
     CreateOnion(cln::CreateonionRequest),
     DelDatastore(cln::DeldatastoreRequest),
+    DelExpiredInvoice(cln::DelexpiredinvoiceRequest),
     DelInvoice(cln::DelinvoiceRequest),
     Invoice(cln::InvoiceRequest),
     ListDatastore(cln::ListdatastoreRequest),

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

@@ -99,7 +99,7 @@ impl Resolver {
                     // Manually calling preapproveinvoice should
                     // always be allowed. The bolt11 string have to
                     // match.
-                    l.invstring.0 == r.bolt11.as_bytes()
+                    l.invstring.0 == r.bolt11().as_bytes()
                 }
                 (_, _) => false,
             };

libs/gl-plugin/Cargo.toml

@@ -21,7 +21,7 @@ base64 = "0.21.7"
 bytes = { version = "1", features = ["serde"] }
 clightningrpc = "0.2"
 cln-grpc = { workspace = true, features = ["server"] }
-cln-plugin = { workspace = true }
+cln-plugin = "^0.1"
 cln-rpc = { workspace = true }
 env_logger = "^0.7.1"
 futures = "0.3"

libs/gl-plugin/src/lib.rs

@@ -158,9 +158,12 @@ async fn on_peer_connected(plugin: Plugin, v: serde_json::Value) -> Result<serde
 async fn on_openchannel(plugin: Plugin, v: serde_json::Value) -> Result<serde_json::Value> {
     debug!("Received an openchannel request: {:?}", v);
     let mut rpc = cln_rpc::ClnRpc::new(plugin.configuration().rpc_file).await?;
-
-    let req = cln_rpc::model::requests::ListdatastoreRequest {
-        key: Some(vec!["glconf".to_string(), "request".to_string()]),
+
+    let req = cln_rpc::model::requests::ListdatastoreRequest{
+        key: Some(vec![
+            "glconf".to_string(),
+            "request".to_string(),
+        ])
     };
 
     let res = rpc.call_typed(&req).await;
@@ -171,17 +174,13 @@ async fn on_openchannel(plugin: Plugin, v: serde_json::Value) -> Result<serde_js
             if !res.datastore.is_empty() {
                 match &res.datastore[0].string {
                     Some(serialized_request) => {
-                        match _parse_gl_config_from_serialized_request(
-                            serialized_request.to_string(),
-                        ) {
+                        match _parse_gl_config_from_serialized_request(serialized_request.to_string()) {
                             Some(gl_config) => {
-                                return Ok(
-                                    json!({"result": "continue", "close_to":  gl_config.close_to_addr}),
-                                );
+                                return Ok(json!({"result": "continue", "close_to":  gl_config.close_to_addr}));
                             }
                             None => {
                                 debug!("Failed to parse the GlConfig from the serialized request's payload");
-                            }
+                            }  
                         }
                     }
                     None => {
@@ -190,13 +189,10 @@ async fn on_openchannel(plugin: Plugin, v: serde_json::Value) -> Result<serde_js
                 }
             }
 
-            return Ok(json!({"result": "continue"}));
+            return Ok(json!({"result": "continue"}))
         }
         Err(e) => {
-            log::debug!(
-                "An error occurred while searching for a custom close_to address: {}",
-                e
-            );
+            log::debug!("An error occurred while searching for a custom close_to address: {}", e);
             Ok(json!({"result": "continue"}))
         }
     }

libs/gl-plugin/src/node/mod.rs

@@ -58,7 +58,6 @@ pub struct PluginNodeServer {
     pub rpc: Arc<Mutex<LightningClient>>,
     rpc_path: PathBuf,
     events: tokio::sync::broadcast::Sender<super::Event>,
-    notifications: tokio::sync::broadcast::Sender<cln_rpc::Notification>,
     signer_state: Arc<Mutex<State>>,
     grpc_binding: String,
     signer_state_store: Arc<Mutex<Box<dyn StateStore>>>,
@@ -99,8 +98,6 @@ impl PluginNodeServer {
 
         let rrpc = rpc.clone();
 
-        let (notifications, _) = tokio::sync::broadcast::channel(1);
-
         let s = PluginNodeServer {
             ctx,
             tls,
@@ -111,7 +108,6 @@ impl PluginNodeServer {
             signer_state: Arc::new(Mutex::new(signer_state)),
             signer_state_store: Arc::new(Mutex::new(signer_state_store)),
             grpc_binding: config.node_grpc_binding,
-            notifications,
         };
 
         tokio::spawn(async move {