Skip to content

Commit 036c566

Browse files
committed
fix server.py
2 parents cba35ef + 2cf04ca commit 036c566

8 files changed

Lines changed: 46 additions & 102 deletions

File tree

Cargo.lock

Lines changed: 31 additions & 91 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ members = [
2222
]
2323

2424
[workspace.dependencies]
25-
cln-rpc = { path = "cln-rpc", version = "0.5.0" }
26-
cln-grpc = { path = "cln-grpc", version = "0.5.0" }
27-
cln-plugin = { path = "plugins", version = "0.5.0" }
25+
cln-rpc = { path = "cln-rpc", version = "0.6.0" }
26+
cln-grpc = { path = "cln-grpc", version = "0.6.0" }
27+
cln-plugin = { path = "plugins", version = "0.6.0" }

cln-grpc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cln-grpc"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2021"
55
license = "MIT"
66
description = "The Core Lightning API as grpc primitives. Provides the bindings used to expose the API over the network."
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
2121
tonic = { version = "0.11", features = ["tls", "transport"] }
2222
prost = "0.12"
2323
hex = "0.4.3"
24-
bitcoin = { version = "0.31", features = ["serde"] }
24+
bitcoin = { version = "0.32.2", features = ["serde"] }
2525
tokio-stream = { version = "0.1.14", features = ["sync"] }
2626
tokio = { version = "1.36.0", features = ["sync"] }
2727
futures-core = "0.3.30"

cln-rpc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cln-rpc"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2021"
55
license = "MIT"
66
description = "An async RPC client for Core Lightning."
@@ -14,7 +14,7 @@ path = "examples/getinfo.rs"
1414

1515
[dependencies]
1616
anyhow = "1.0"
17-
bitcoin = { version = "0.31", features = [ "serde" ] }
17+
bitcoin = { version = "0.32.2", features = [ "serde" ] }
1818
bytes = "1"
1919
futures-util = { version = "0.3", features = [ "sink" ] }
2020
hex = "0.4.3"

contrib/msggen/msggen/gen/grpc/server.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ def generate(self, service: Service) -> None:
113113
#[tonic::async_trait]
114114
impl Node for Server
115115
{{
116+
<<<<<<< HEAD
116117
"""
118+
=======
119+
""",
120+
>>>>>>> 2cf04ca2fc31ae2d71ae45c3486cea93583f0b5f
117121
.replace("{{", "{").replace("}}", "}"),
118122
numindent=0,
119123
)

plugins/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cln-plugin"
3-
version = "0.5.0"
3+
version = "0.6.0"
44
edition = "2021"
55
license = "MIT"
66
description = "A CLN plugin library. Write your plugin in Rust."

plugins/bip353-plugin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tokio = "1"
1717

1818
log-panics = "2"
1919

20-
cln-plugin = { version = "0.5", path = "../../plugins" }
20+
cln-plugin = { workspace = true }
2121

2222
bitcoin-payment-instructions = { version = "0.5.0", features = ["http"] }
2323

plugins/lsps-plugin/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cln-lsps"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
edition = "2021"
55

66
[[bin]]
@@ -14,7 +14,7 @@ path = "src/service.rs"
1414
[dependencies]
1515
anyhow = "1.0"
1616
async-trait = "0.1"
17-
bitcoin = "0.31"
17+
bitcoin = "0.32.2"
1818
chrono = { version= "0.4.42", features = ["serde"] }
1919
cln-plugin = { workspace = true }
2020
cln-rpc = { workspace = true }

0 commit comments

Comments
 (0)