refactor: replace entropy_bytes with word_count

- Rename MnemonicWordCount to WordCount and update references as needed
- Remove need for entropy_bytes in generate_entropy_mnemonic by passing WordCount enum directly to generate() instead
- Add rand feature to bip39 dependency

Author: coreyphillips

Cargo.toml

@@ -50,7 +50,7 @@ reqwest = { version = "0.12", default-features = false, features = ["json", "rus
 rustls = { version = "0.23", default-features = false }
 rusqlite = { version = "0.31.0", features = ["bundled"] }
 bitcoin = "0.32.7"
-bip39 = "2.0.0"
+bip39 = { version = "2.0.0", features = ["rand"] }
 bip21 = { version = "0.5", features = ["std"], default-features = false }
 
 base64 = { version = "0.22.1", default-features = false, features = ["std"] }

bindings/ldk_node.udl

@@ -1,5 +1,5 @@
 namespace ldk_node {
-	Mnemonic generate_entropy_mnemonic(MnemonicWordCount? word_count);
+	Mnemonic generate_entropy_mnemonic(WordCount? word_count);
 	Config default_config();
 };
 
@@ -46,7 +46,7 @@ dictionary LSPS2ServiceConfig {
 	u64 max_payment_size_msat;
 };
 
-enum MnemonicWordCount {
+enum WordCount {
 	"Words12",
 	"Words15",
 	"Words18",

src/io/utils.rs

@@ -47,7 +47,7 @@ use crate::io::{
 };
 use crate::logger::{log_error, LdkLogger, Logger};
 use crate::peer_store::PeerStore;
-use crate::types::{Broadcaster, DynStore, KeysManager, MnemonicWordCount, Sweeper};
+use crate::types::{Broadcaster, DynStore, KeysManager, Sweeper, WordCount};
 use crate::wallet::ser::{ChangeSetDeserWrapper, ChangeSetSerWrapper};
 use crate::{Error, EventQueue, NodeMetrics, PaymentDetails};
 
@@ -63,12 +63,9 @@ pub const EXTERNAL_PATHFINDING_SCORES_CACHE_KEY: &str = "external_pathfinding_sc
 /// [BIP 39]: https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki
 /// [`Node`]: crate::Node
 /// [`Builder::set_entropy_bip39_mnemonic`]: crate::Builder::set_entropy_bip39_mnemonic
-pub fn generate_entropy_mnemonic(word_count: Option<MnemonicWordCount>) -> Mnemonic {
-	let word_count = word_count.unwrap_or(MnemonicWordCount::Words24);
-	let entropy_bytes = word_count.entropy_bytes();
-	let mut entropy = vec![0u8; entropy_bytes];
-	OsRng.try_fill_bytes(&mut entropy).expect("Failed to generate entropy");
-	Mnemonic::from_entropy(&entropy).unwrap()
+pub fn generate_entropy_mnemonic(word_count: Option<WordCount>) -> Mnemonic {
+	let word_count = word_count.unwrap_or(WordCount::Words24).word_count();
+	Mnemonic::generate(word_count).expect("Failed to generate mnemonic")
 }
 
 pub(crate) fn read_or_generate_seed_file<L: Deref>(
@@ -638,11 +635,11 @@ mod tests {
 
 		// Test with different word counts
 		let word_counts = [
-			MnemonicWordCount::Words12,
-			MnemonicWordCount::Words15,
-			MnemonicWordCount::Words18,
-			MnemonicWordCount::Words21,
-			MnemonicWordCount::Words24,
+			WordCount::Words12,
+			WordCount::Words15,
+			WordCount::Words18,
+			WordCount::Words21,
+			WordCount::Words24,
 		];
 
 		for word_count in word_counts {
@@ -652,11 +649,11 @@ mod tests {
 
 			// Verify expected word count
 			let expected_words = match word_count {
-				MnemonicWordCount::Words12 => 12,
-				MnemonicWordCount::Words15 => 15,
-				MnemonicWordCount::Words18 => 18,
-				MnemonicWordCount::Words21 => 21,
-				MnemonicWordCount::Words24 => 24,
+				WordCount::Words12 => 12,
+				WordCount::Words15 => 15,
+				WordCount::Words18 => 18,
+				WordCount::Words21 => 21,
+				WordCount::Words24 => 24,
 			};
 			assert_eq!(mnemonic.word_count(), expected_words);
 		}

src/lib.rs

@@ -155,8 +155,8 @@ use types::{
 	OnionMessenger, PaymentStore, PeerManager, Router, Scorer, Sweeper, Wallet,
 };
 pub use types::{
-	ChannelDetails, CustomTlvRecord, DynStore, MnemonicWordCount, PeerDetails, SyncAndAsyncKVStore,
-	UserChannelId,
+	ChannelDetails, CustomTlvRecord, DynStore, PeerDetails, SyncAndAsyncKVStore, UserChannelId,
+	WordCount,
 };
 pub use {
 	bip39, bitcoin, lightning, lightning_invoice, lightning_liquidity, lightning_types, tokio,

src/types.rs

@@ -38,7 +38,7 @@ use crate::payment::PaymentDetails;
 
 /// Supported BIP39 mnemonic word counts for entropy generation.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum MnemonicWordCount {
+pub enum WordCount {
 	/// 12-word mnemonic (128-bit entropy)
 	Words12,
 	/// 15-word mnemonic (160-bit entropy)
@@ -51,15 +51,15 @@ pub enum MnemonicWordCount {
 	Words24,
 }
 
-impl MnemonicWordCount {
-	/// Returns the entropy size in bytes for the word count.
-	pub fn entropy_bytes(&self) -> usize {
+impl WordCount {
+	/// Returns the word count as a usize value.
+	pub fn word_count(&self) -> usize {
 		match self {
-			MnemonicWordCount::Words12 => 16, // 128 bits
-			MnemonicWordCount::Words15 => 20, // 160 bits
-			MnemonicWordCount::Words18 => 24, // 192 bits
-			MnemonicWordCount::Words21 => 28, // 224 bits
-			MnemonicWordCount::Words24 => 32, // 256 bits
+			WordCount::Words12 => 12,
+			WordCount::Words15 => 15,
+			WordCount::Words18 => 18,
+			WordCount::Words21 => 21,
+			WordCount::Words24 => 24,
 		}
 	}
 }