Skip to content

Commit a27e1a9

Browse files
authoredJun 16, 2022
Merge pull request #52 from crisdut/fix/regtest-support
Chain mismatch for regtest
2 parents 5ee0315 + 11db1a7 commit a27e1a9

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed
 

‎src/lnpd/funding.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,20 @@ impl FundingWallet {
164164
fs::OpenOptions::new().read(true).write(true).create(false).open(wallet_path)?;
165165
let wallet_data = WalletData::strict_decode(&wallet_file)?;
166166

167-
let network = chain.try_into()?;
168-
if DescriptorExt::<bitcoin::PublicKey>::network(&wallet_data.descriptor)? != network {
167+
let target_network = chain.try_into()?;
168+
let wallet_network = DescriptorExt::<bitcoin::PublicKey>::network(&wallet_data.descriptor)?;
169+
170+
let is_correct_network = match (wallet_network, target_network) {
171+
(Network::Bitcoin, Network::Bitcoin) => true,
172+
(Network::Testnet, Network::Testnet | Network::Regtest | Network::Signet) => true,
173+
_ => false,
174+
};
175+
176+
if !is_correct_network {
169177
return Err(Error::ChainMismatch);
170178
}
171179

172-
FundingWallet::init(network, wallet_data, wallet_file, electrum_url)
180+
FundingWallet::init(target_network, wallet_data, wallet_file, electrum_url)
173181
}
174182

175183
fn init(

0 commit comments

Comments
 (0)
Please sign in to comment.