msggen: add upgradewallet method

Changelog-None
ElementsProject · May 15, 2024 · c1c6763 · c1c6763
1 parent 8edd3d4
commit c1c6763
Show file tree

Hide file tree

Showing 9 changed files with 293 additions and 81 deletions.
diff --git a/.msggen.json b/.msggen.json
@@ -2470,6 +2470,16 @@
         "UnreserveinputsResponse": {
             "UnreserveInputs.reservations[]": 1
         },
+        "UpgradewalletRequest": {
+            "UpgradeWallet.feerate": 1,
+            "UpgradeWallet.reservedok": 2
+        },
+        "UpgradewalletResponse": {
+            "UpgradeWallet.psbt": 2,
+            "UpgradeWallet.tx": 3,
+            "UpgradeWallet.txid": 4,
+            "UpgradeWallet.upgraded_outs": 1
+        },
         "UtxopsbtRequest": {
             "UtxoPsbt.excess_as_change": 9,
             "UtxoPsbt.feerate": 2,
@@ -8549,6 +8559,34 @@
             "added": "pre-v0.10.1",
             "deprecated": false
         },
+        "UpgradeWallet": {
+            "added": "pre-v0.10.1",
+            "deprecated": null
+        },
+        "UpgradeWallet.feerate": {
+            "added": "v23.02",
+            "deprecated": false
+        },
+        "UpgradeWallet.psbt": {
+            "added": "v23.02",
+            "deprecated": false
+        },
+        "UpgradeWallet.reservedok": {
+            "added": "v23.02",
+            "deprecated": false
+        },
+        "UpgradeWallet.tx": {
+            "added": "v23.02",
+            "deprecated": false
+        },
+        "UpgradeWallet.txid": {
+            "added": "v23.02",
+            "deprecated": false
+        },
+        "UpgradeWallet.upgraded_outs": {
+            "added": "v23.02",
+            "deprecated": false
+        },
         "UtxoPsbt": {
             "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
@@ -2682,6 +2682,38 @@ async fn unreserve_inputs(
 
 }
 
+async fn upgrade_wallet(
+    &self,
+    request: tonic::Request<pb::UpgradewalletRequest>,
+) -> Result<tonic::Response<pb::UpgradewalletResponse>, tonic::Status> {
+    let req = request.into_inner();
+    let req: requests::UpgradewalletRequest = req.into();
+    debug!("Client asked for upgrade_wallet");
+    trace!("upgrade_wallet 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::UpgradeWallet(req))
+        .await
+        .map_err(|e| Status::new(
+           Code::Unknown,
+           format!("Error calling method UpgradeWallet: {:?}", e)))?;
+    match result {
+        Response::UpgradeWallet(r) => {
+           trace!("upgrade_wallet response: {:?}", r);
+           Ok(tonic::Response::new(r.into()))
+        },
+        r => Err(Status::new(
+            Code::Internal,
+            format!(
+                "Unexpected result {:?} to method call UpgradeWallet",
+                r
+            )
+        )),
+    }
+
+}
+
 async fn wait_block_height(
     &self,
     request: tonic::Request<pb::WaitblockheightRequest>,

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
@@ -144,6 +144,7 @@ def load_jsonrpc_service():
         "Splice_Signed",
         "Splice_Update",
         "UnreserveInputs",
+        "UpgradeWallet",
         "WaitBlockHeight",
         "Wait",
         # "ListConfigs",

diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
diff --git a/contrib/pyln-grpc-proto/pyln/grpc/node_pb2_grpc.py b/contrib/pyln-grpc-proto/pyln/grpc/node_pb2_grpc.py
@@ -429,6 +429,11 @@ def __init__(self, channel):
                 request_serializer=node__pb2.UnreserveinputsRequest.SerializeToString,
                 response_deserializer=node__pb2.UnreserveinputsResponse.FromString,
                 )
+        self.UpgradeWallet = channel.unary_unary(
+                '/cln.Node/UpgradeWallet',
+                request_serializer=node__pb2.UpgradewalletRequest.SerializeToString,
+                response_deserializer=node__pb2.UpgradewalletResponse.FromString,
+                )
         self.WaitBlockHeight = channel.unary_unary(
                 '/cln.Node/WaitBlockHeight',
                 request_serializer=node__pb2.WaitblockheightRequest.SerializeToString,
@@ -992,6 +997,12 @@ def UnreserveInputs(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def UpgradeWallet(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def WaitBlockHeight(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -1482,6 +1493,11 @@ def add_NodeServicer_to_server(servicer, server):
                     request_deserializer=node__pb2.UnreserveinputsRequest.FromString,
                     response_serializer=node__pb2.UnreserveinputsResponse.SerializeToString,
             ),
+            'UpgradeWallet': grpc.unary_unary_rpc_method_handler(
+                    servicer.UpgradeWallet,
+                    request_deserializer=node__pb2.UpgradewalletRequest.FromString,
+                    response_serializer=node__pb2.UpgradewalletResponse.SerializeToString,
+            ),
             'WaitBlockHeight': grpc.unary_unary_rpc_method_handler(
                     servicer.WaitBlockHeight,
                     request_deserializer=node__pb2.WaitblockheightRequest.FromString,
@@ -2963,6 +2979,23 @@ def UnreserveInputs(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def UpgradeWallet(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/cln.Node/UpgradeWallet',
+            node__pb2.UpgradewalletRequest.SerializeToString,
+            node__pb2.UpgradewalletResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def WaitBlockHeight(request,
             target,

diff --git a/contrib/pyln-testing/pyln/testing/grpc2py.py b/contrib/pyln-testing/pyln/testing/grpc2py.py
@@ -1891,6 +1891,15 @@ def unreserveinputs2py(m):
     })
 
 
+def upgradewallet2py(m):
+    return remove_default({
+        "psbt": m.psbt,  # PrimitiveField in generate_composite
+        "tx": hexlify(m.tx),  # PrimitiveField in generate_composite
+        "txid": hexlify(m.txid),  # PrimitiveField in generate_composite
+        "upgraded_outs": m.upgraded_outs,  # PrimitiveField in generate_composite
+    })
+
+
 def waitblockheight2py(m):
     return remove_default({
         "blockheight": m.blockheight,  # PrimitiveField in generate_composite