f accept 0conf

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -4276,7 +4276,7 @@ where
 		let mut unfunded_channels = 0;
 		let best_block_height = self.best_block.read().unwrap().height();
 		for (_, chan) in peer_state.channel_by_id.iter() {
-			if chan.get_funding_tx_confirmations(best_block_height) == 0 {
+			if chan.get_funding_tx_confirmations(best_block_height) == 0 && chan.minimum_depth() != 0 {
 				unfunded_channels += 1;
 			}
 		}
@@ -6250,7 +6250,7 @@ where
 			for (_, peer) in peer_state_lock.iter() {
 				let mut has_funded_channels = false;
 				for (_, chan) in peer.lock().unwrap().channel_by_id.iter() {
-					if chan.get_funding_tx_confirmations(best_block_height) != 0 {
+					if chan.get_funding_tx_confirmations(best_block_height) != 0 || chan.minimum_depth() == 0 {
 						has_funded_channels = true;
 					}
 				}