Revert "fixup: simplify tlv fields with (default_value,x)"

This reverts commit 22a7f78.

Author: martinsaposnic

lightning/src/chain/channelmonitor.rs

@@ -6535,10 +6535,8 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 			(32, pending_funding, optional_vec),
 			(33, htlcs_resolved_to_user, option),
 			(34, alternative_funding_confirmed, option),
-			(35, is_manual_broadcast, (default_value, false)),
-			// Older monitors prior to LDK 0.2 assume this is `true` when absent 
-			// during upgrade so holder broadcasts aren't gated unexpectedly.
-			(37, funding_seen_onchain, (default_value, true)),
+			(35, is_manual_broadcast, option),
+			(37, funding_seen_onchain, option),
 		});
 		// Note that `payment_preimages_with_info` was added (and is always written) in LDK 0.1, so
 		// we can use it to determine if this monitor was last written by LDK 0.1 or later.
@@ -6656,8 +6654,10 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 				prev_holder_commitment_tx,
 			},
 			pending_funding: pending_funding.unwrap_or(vec![]),
-			is_manual_broadcast: is_manual_broadcast.unwrap(),
-			funding_seen_onchain: funding_seen_onchain.unwrap(),
+			is_manual_broadcast: is_manual_broadcast.unwrap_or(false),
+			// Older monitors prior to LDK 0.2 assume this is `true` when absent 
+			// during upgrade so holder broadcasts aren't gated unexpectedly.
+			funding_seen_onchain: funding_seen_onchain.unwrap_or(true),
 
 			latest_update_id,
 			commitment_transaction_number_obscure_factor,