Merge branch 'ElementsProject:master' into 7117-repro-nightly-builds-…

…test-1
s373nZ · Oct 4, 2024 · f3a9dca · f3a9dca
2 parents 2804e6f + 81e30ea
commit f3a9dca
Show file tree

Hide file tree

Showing 89 changed files with 3,549 additions and 2,069 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -456,6 +456,11 @@ else
 PYTEST_OPTS += -x
 endif
 
+# Allow for targeting specific tests by setting the PYTEST_TESTS environment variable.
+ifeq ($(PYTEST_TESTS),)
+PYTEST_TESTS = "tests/"
+endif
+
 check-units:
 
 check: check-units installcheck pytest
@@ -466,7 +471,7 @@ ifeq ($(PYTEST),)
 	exit 1
 else
 # Explicitly hand VALGRIND so you can override on make cmd line.
-	PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 VALGRIND=$(VALGRIND) $(PYTEST) tests/ $(PYTEST_OPTS)
+	PYTHONPATH=$(MY_CHECK_PYTHONPATH) TEST_DEBUG=1 VALGRIND=$(VALGRIND) $(PYTEST) $(PYTEST_TESTS) $(PYTEST_OPTS)
 endif
 
 check-fuzz: $(ALL_FUZZ_TARGETS)

diff --git a/cln-grpc/Cargo.toml b/cln-grpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cln-grpc"
-version = "0.1.9"
+version = "0.2.0"
 edition = "2021"
 license = "MIT"
 description = "The Core Lightning API as grpc primitives. Provides the bindings used to expose the API over the network."
@@ -15,10 +15,10 @@ server = ["cln-rpc"]
 [dependencies]
 anyhow = "1.0"
 log = "0.4"
-cln-rpc = { path="../cln-rpc/", version = "^0.1", optional = true }
-tonic = { version = "0.8", features = ["tls", "transport"] }
-prost = "0.11"
+cln-rpc = { path="../cln-rpc/", version = "0.2", optional = true }
 serde = { version = "1.0", features = ["derive"] }
+tonic = { version = "0.11", features = ["tls", "transport"] }
+prost = "0.12"
 hex = "0.4.3"
 bitcoin = { version = "0.30", features = [ "serde" ] }
 tokio-stream = { version = "0.1.14", features = ["sync"] }
@@ -28,7 +28,7 @@ tokio-util = "0.7.10"
 
 [dev-dependencies]
 serde_json = "1.0.72"
-cln-rpc = { path="../cln-rpc/", version = "^0.1" }
+cln-rpc = { path="../cln-rpc/", version = "0.2" }
 
 [build-dependencies]
-tonic-build = "0.8"
+tonic-build = "0.11"
diff --git a/cln-grpc/proto/primitives.proto b/cln-grpc/proto/primitives.proto
@@ -127,6 +127,7 @@ enum ChannelTypeName {
   anchors_zero_fee_htlc_tx_even = 2;
   scid_alias_even = 3;
   zeroconf_even = 4;
+  anchors_even = 5;
 }
 
 enum AutocleanSubsystem {

diff --git a/cln-rpc/Cargo.toml b/cln-rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cln-rpc"
-version = "0.1.9"
+version = "0.2.0"
 edition = "2021"
 license = "MIT"
 description = "An async RPC client for Core Lightning."

diff --git a/cln-rpc/src/model.rs b/cln-rpc/src/model.rs
diff --git a/cln-rpc/src/primitives.rs b/cln-rpc/src/primitives.rs
@@ -67,6 +67,8 @@ pub enum ChannelTypeName {
     SCID_ALIAS_EVEN = 3,
     #[serde(rename = "zeroconf/even")]
     ZEROCONF_EVEN = 4,
+    #[serde(rename = "anchors/even")]
+    ANCHORS_EVEN = 5,
 }
 
 #[derive(Copy, Clone, Serialize, Deserialize, Debug)]
@@ -407,6 +409,7 @@ impl From<i32> for ChannelTypeName {
             2 => ChannelTypeName::ANCHORS_ZERO_FEE_HTLC_TX_EVEN,
             3 => ChannelTypeName::SCID_ALIAS_EVEN,
             4 => ChannelTypeName::ZEROCONF_EVEN,
+            5 => ChannelTypeName::ANCHORS_EVEN,
             o => panic!("Unmapped ChannelTypeName {}", o),
         }
     }
@@ -420,6 +423,7 @@ impl From<ChannelTypeName> for i32 {
             ChannelTypeName::ANCHORS_ZERO_FEE_HTLC_TX_EVEN => 2,
             ChannelTypeName::SCID_ALIAS_EVEN => 3,
             ChannelTypeName::ZEROCONF_EVEN => 4,
+            ChannelTypeName::ANCHORS_EVEN => 5,
         }
     }
 }