Account for missing refund_onchain_address field

We allow de/serializing if the field is absent and mirror it back in
`CreateOrderResponse`, as per recent spec change.

Author: tnull

src/lsps1/client.rs

@@ -27,6 +27,7 @@ use lightning::util::errors::APIError;
 use lightning::util::logger::Level;
 
 use bitcoin::secp256k1::PublicKey;
+use bitcoin::Address;
 
 use core::ops::Deref;
 
@@ -189,6 +190,7 @@ where
 	/// The client agrees to paying channel fees according to the provided parameters.
 	pub fn create_order(
 		&self, counterparty_node_id: &PublicKey, order: OrderParameters,
+		refund_onchain_address: Option<Address>,
 	) -> RequestId {
 		let (request_id, request_msg) = {
 			let mut outer_state_lock = self.per_peer_state.write().unwrap();
@@ -198,7 +200,8 @@ where
 			let mut peer_state_lock = inner_state_lock.lock().unwrap();
 
 			let request_id = crate::utils::generate_request_id(&self.entropy_source);
-			let request = LSPS1Request::CreateOrder(CreateOrderRequest { order });
+			let request =
+				LSPS1Request::CreateOrder(CreateOrderRequest { order, refund_onchain_address });
 			let msg = LSPS1Message::Request(request_id.clone(), request).into();
 			peer_state_lock.pending_create_order_requests.insert(request_id.clone());
 

src/lsps1/msgs.rs

@@ -85,6 +85,11 @@ pub struct CreateOrderRequest {
 	/// The order made.
 	#[serde(flatten)]
 	pub order: OrderParameters,
+	/// The address where the LSP will send the funds if the order fails.
+	#[serde(default)]
+	#[serde(skip_serializing_if = "Option::is_none")]
+	#[serde(with = "unchecked_address_option")]
+	pub refund_onchain_address: Option<Address>,
 }
 
 /// An object representing an LSPS1 channel order.
@@ -107,9 +112,6 @@ pub struct OrderParameters {
 	pub channel_expiry_blocks: u32,
 	/// May contain arbitrary associated data like a coupon code or a authentication token.
 	pub token: Option<String>,
-	/// The address where the LSP will send the funds if the order fails.
-	#[serde(with = "unchecked_address_option")]
-	pub refund_onchain_address: Option<Address>,
 	/// Indicates if the channel should be announced to the network.
 	pub announce_channel: bool,
 }
@@ -194,6 +196,11 @@ pub struct OnchainPaymentInfo {
 	/// confirmed without a confirmation.
 	#[serde(with = "u32_fee_rate")]
 	pub min_fee_for_0conf: FeeRate,
+	/// The address where the LSP will send the funds if the order fails.
+	#[serde(default)]
+	#[serde(skip_serializing_if = "Option::is_none")]
+	#[serde(with = "unchecked_address_option")]
+	pub refund_onchain_address: Option<Address>,
 }
 
 /// The state of a BOLT 11 payment.
@@ -445,9 +452,10 @@ mod tests {
 					"expires_at": "2015-01-25T19:29:44.612Z",
 					"fee_total_sat": "9999",
 					"order_total_sat": "2009999",
-					"address": "bc1qvmsy0f3yyes6z9jvddk8xqwznndmdwapvrc0xrmhd3vqj5rhdrrq6hz49h",
+					"address" : "bc1p5uvtaxzkjwvey2tfy49k5vtqfpjmrgm09cvs88ezyy8h2zv7jhas9tu4yr",
 					"min_fee_for_0conf": 253,
-					"min_onchain_payment_confirmations": 0
+					"min_onchain_payment_confirmations": 0,
+					"refund_onchain_address": "bc1qvmsy0f3yyes6z9jvddk8xqwznndmdwapvrc0xrmhd3vqj5rhdrrq6hz49h"
 				}
 			},
 			"channel": null