merge dev

Author: txalkan

rust-lightning

@@ -1232,7 +1232,7 @@ async fn open_channel_raw(
         asset_amount,
         asset_id: asset_id.map(|a| a.to_string()),
         push_asset_amount,
-        public: true,
+        public,
         with_anchors,
         fee_base_msat,
         fee_proportional_millionths,
@@ -1385,6 +1385,7 @@ async fn open_virtual_channel(
         None,
         None,
         None,
+        None,
         true,
         false,
         Some("trusted_no_broadcast"),

src/test/mod.rs

@@ -168,6 +168,7 @@ async fn open_fail() {
         fee_base_msat: None,
         fee_proportional_millionths: None,
         temporary_channel_id: None,
+        virtual_open_mode: None,
     };
     let res = reqwest::Client::new()
         .post(format!("http://{node1_addr}/openchannel"))
@@ -196,6 +197,7 @@ async fn open_fail() {
         fee_base_msat: None,
         fee_proportional_millionths: None,
         temporary_channel_id: None,
+        virtual_open_mode: None,
     };
     let res = reqwest::Client::new()
         .post(format!("http://{node1_addr}/openchannel"))

src/test/openchannel_fail.rs

@@ -126,6 +126,7 @@ async fn virtual_open_rejects_duplicate_synthetic_funding_outpoint() {
         push_msat: 0,
         asset_amount: Some(200),
         asset_id: Some(issued_asset_id),
+        push_asset_amount: None,
         public: false,
         with_anchors: true,
         fee_base_msat: None,
@@ -208,6 +209,7 @@ async fn virtual_open_rejects_invalid_requests() {
         push_msat: 0,
         asset_amount: Some(100),
         asset_id: Some(issued_asset_id.clone()),
+        push_asset_amount: None,
         public: false,
         with_anchors: true,
         fee_base_msat: None,
@@ -238,6 +240,7 @@ async fn virtual_open_rejects_invalid_requests() {
         push_msat: 0,
         asset_amount: Some(100),
         asset_id: Some(issued_asset_id.clone()),
+        push_asset_amount: None,
         public: false,
         with_anchors: true,
         fee_base_msat: None,
@@ -268,6 +271,7 @@ async fn virtual_open_rejects_invalid_requests() {
         push_msat: 0,
         asset_amount: Some(100),
         asset_id: Some(issued_asset_id),
+        push_asset_amount: None,
         public: true,
         with_anchors: true,
         fee_base_msat: None,