Skip to content

msggen: add multiwithdraw method #7271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daywalker90 wants to merge 1 commit into from
Closed

msggen: add multiwithdraw method #7271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 41 additions & 84 deletions .msggen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,9 +978,7 @@
},
"Fundchannel_startChannel_type": {
"FundChannel_Start.channel_type.bits[]": 1,
"FundChannel_Start.channel_type.names[]": 2,
"Fundchannel_Start.channel_type.bits[]": 1,
"Fundchannel_Start.channel_type.names[]": 2
"FundChannel_Start.channel_type.names[]": 2
},
"Fundchannel_startRequest": {
"FundChannel_Start.amount": 2,
Expand All @@ -991,30 +989,15 @@
"FundChannel_Start.id": 1,
"FundChannel_Start.mindepth": 7,
"FundChannel_Start.push_msat": 6,
"FundChannel_Start.reserve": 8,
"Fundchannel_Start.amount": 9,
"Fundchannel_Start.announce": 3,
"Fundchannel_Start.channel_type[]": 8,
"Fundchannel_Start.close_to": 4,
"Fundchannel_Start.feerate": 2,
"Fundchannel_Start.id": 1,
"Fundchannel_Start.mindepth": 6,
"Fundchannel_Start.push_msat": 5,
"Fundchannel_Start.reserve": 7
"FundChannel_Start.reserve": 8
},
"Fundchannel_startResponse": {
"FundChannel_Start.channel_type": 3,
"FundChannel_Start.close_to": 4,
"FundChannel_Start.funding_address": 1,
"FundChannel_Start.mindepth": 6,
"FundChannel_Start.scriptpubkey": 2,
"FundChannel_Start.warning_usage": 5,
"Fundchannel_Start.channel_type": 3,
"Fundchannel_Start.close_to": 4,
"Fundchannel_Start.funding_address": 1,
"Fundchannel_Start.mindepth": 6,
"Fundchannel_Start.scriptpubkey": 2,
"Fundchannel_Start.warning_usage": 5
"FundChannel_Start.warning_usage": 5
},
"FundpsbtRequest": {
"FundPsbt.excess_as_change": 8,
Expand Down Expand Up @@ -1786,6 +1769,16 @@
"multifundchannel.tx": 1,
"multifundchannel.txid": 2
},
"MultiwithdrawRequest": {
"MultiWithdraw.feerate": 2,
"MultiWithdraw.minconf": 3,
"MultiWithdraw.outputs[]": 1,
"MultiWithdraw.utxos[]": 4
},
"MultiwithdrawResponse": {
"MultiWithdraw.tx": 1,
"MultiWithdraw.txid": 2
},
"NewaddrRequest": {
"NewAddr.addresstype": 1
},
Expand Down Expand Up @@ -4196,70 +4189,6 @@
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start": {
"added": "pre-v0.10.1",
"deprecated": null
},
"Fundchannel_Start.amount": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.announce": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.channel_type": {
"added": "v24.02",
"deprecated": false
},
"Fundchannel_Start.channel_type.bits[]": {
"added": "v24.02",
"deprecated": false
},
"Fundchannel_Start.channel_type.names[]": {
"added": "v24.02",
"deprecated": false
},
"Fundchannel_Start.channel_type[]": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.close_to": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.feerate": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.funding_address": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.id": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.mindepth": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.push_msat": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.reserve": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.scriptpubkey": {
"added": "pre-v0.10.1",
"deprecated": false
},
"Fundchannel_Start.warning_usage": {
"added": "pre-v0.10.1",
"deprecated": false
},
"GetRoute": {
"added": "pre-v0.10.1",
"deprecated": null
Expand Down Expand Up @@ -6496,6 +6425,34 @@
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw": {
"added": "pre-v0.10.1",
"deprecated": null
},
"MultiWithdraw.feerate": {
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw.minconf": {
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw.outputs[]": {
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw.tx": {
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw.txid": {
"added": "pre-v0.10.1",
"deprecated": false
},
"MultiWithdraw.utxos[]": {
"added": "pre-v0.10.1",
"deprecated": false
},
"NewAddr": {
"added": "pre-v0.10.1",
"deprecated": null
Expand Down
13 changes: 13 additions & 0 deletions cln-grpc/proto/node.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions cln-grpc/src/convert.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions cln-grpc/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1882,6 +1882,38 @@ async fn multi_fund_channel(

}

async fn multi_withdraw(
&self,
request: tonic::Request<pb::MultiwithdrawRequest>,
) -> Result<tonic::Response<pb::MultiwithdrawResponse>, tonic::Status> {
let req = request.into_inner();
let req: requests::MultiwithdrawRequest = req.into();
debug!("Client asked for multi_withdraw");
trace!("multi_withdraw 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::MultiWithdraw(req))
.await
.map_err(|e| Status::new(
Code::Unknown,
format!("Error calling method MultiWithdraw: {:?}", e)))?;
match result {
Response::MultiWithdraw(r) => {
trace!("multi_withdraw response: {:?}", r);
Ok(tonic::Response::new(r.into()))
},
r => Err(Status::new(
Code::Internal,
format!(
"Unexpected result {:?} to method call MultiWithdraw",
r
)
)),
}

}

async fn offer(
&self,
request: tonic::Request<pb::OfferRequest>,
Expand Down
47 changes: 47 additions & 0 deletions cln-rpc/src/model.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contrib/msggen/msggen/utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def load_jsonrpc_service():
"ListPays",
"ListHtlcs",
"MultiFundChannel",
# "multiwithdraw",
"MultiWithdraw",
"Offer",
"OpenChannel_Abort",
"OpenChannel_Bump",
Expand Down
198 changes: 101 additions & 97 deletions contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

Loading