msggen: Include AddPsbtOutput to RPC list and meta field map; regener…

…ate libraries
ElementsProject · Feb 25, 2024 · e050b66 · e050b66
1 parent 052542e
commit e050b66
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 0 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -360,6 +360,17 @@
         "AddgossipRequest": {
             "AddGossip.message": 1
         },
+        "AddpsbtoutputRequest": {
+            "AddPsbtOutput.destination": 4,
+            "AddPsbtOutput.initialpsbt": 3,
+            "AddPsbtOutput.locktime": 2,
+            "AddPsbtOutput.satoshi": 1
+        },
+        "AddpsbtoutputResponse": {
+            "AddPsbtOutput.estimated_added_weight": 2,
+            "AddPsbtOutput.outnum": 3,
+            "AddPsbtOutput.psbt": 1
+        },
         "AutocleaninvoiceRequest": {
             "AutoCleanInvoice.cycle_seconds": 2,
             "AutoCleanInvoice.expired_by": 1
@@ -1854,6 +1865,38 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "AddPsbtOutput": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.destination": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.estimated_added_weight": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.initialpsbt": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.locktime": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.outnum": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.psbt": {
+            "added": "v23.11",
+            "deprecated": false
+        },
+        "AddPsbtOutput.satoshi": {
+            "added": "v23.11",
+            "deprecated": false
+        },
         "AutoCleanInvoice": {
             "added": "pre-v0.10.1",
             "deprecated": null

diff --git a/cln-grpc/proto/node.proto b/cln-grpc/proto/node.proto
diff --git a/cln-grpc/src/convert.rs b/cln-grpc/src/convert.rs
diff --git a/cln-grpc/src/server.rs b/cln-grpc/src/server.rs
@@ -218,6 +218,38 @@ async fn add_gossip(
 
 }
 
+async fn add_psbt_output(
+    &self,
+    request: tonic::Request<pb::AddpsbtoutputRequest>,
+) -> Result<tonic::Response<pb::AddpsbtoutputResponse>, tonic::Status> {
+    let req = request.into_inner();
+    let req: requests::AddpsbtoutputRequest = req.into();
+    debug!("Client asked for add_psbt_output");
+    trace!("add_psbt_output request: {:?}", req);
+    let mut rpc = ClnRpc::new(&self.rpc_path)
+        .await
+        .map_err(|e| Status::new(Code::Internal, e.to_string()))?;
+    let result = rpc.call(Request::AddPsbtOutput(req))
+        .await
+        .map_err(|e| Status::new(
+           Code::Unknown,
+           format!("Error calling method AddPsbtOutput: {:?}", e)))?;
+    match result {
+        Response::AddPsbtOutput(r) => {
+           trace!("add_psbt_output response: {:?}", r);
+           Ok(tonic::Response::new(r.into()))
+        },
+        r => Err(Status::new(
+            Code::Internal,
+            format!(
+                "Unexpected result {:?} to method call AddPsbtOutput",
+                r
+            )
+        )),
+    }
+
+}
+
 async fn auto_clean_invoice(
     &self,
     request: tonic::Request<pb::AutocleaninvoiceRequest>,

diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/contrib/msggen/msggen/utils/utils.py b/contrib/msggen/msggen/utils/utils.py
@@ -57,13 +57,16 @@ def load_jsonrpc_method(name):
 
 
 def load_jsonrpc_service():
+    # FIXME: Maybe this list should be located somewhere other than utils so
+    #  it's more intuitive to remember to update when new RPC calls are added?
     method_names = [
         "Getinfo",
         "ListPeers",
         "ListFunds",
         "SendPay",
         "ListChannels",
         "AddGossip",
+        "AddPsbtOutput",
         "AutoCleanInvoice",
         "CheckMessage",
         "Close",

diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -285,6 +285,14 @@ def addgossip2py(m):
     })
 
 
+def addpsbtoutput2py(m):
+    return remove_default({
+        "psbt": m.psbt,  # PrimitiveField in generate_composite
+        "estimated_added_weight": m.estimated_added_weight,  # PrimitiveField in generate_composite
+        "outnum": m.outnum,  # PrimitiveField in generate_composite
+    })
+
+
 def autocleaninvoice2py(m):
     return remove_default({
         "enabled": m.enabled,  # PrimitiveField in generate_composite