From 14ba2009e89d09cce6c7642f35fb1886a83a0199 Mon Sep 17 00:00:00 2001
From: Machu Pikacchu <177660647+machuPikacchuBTC@users.noreply.github.com>
Date: Thu, 12 Jun 2025 12:00:17 -0400
Subject: [PATCH 1/2] Use configurable seed phrase for mint

---
 config/pool.toml                    | 3 +++
 roles/mint/src/main.rs              | 6 +++---
 roles/roles-utils/config/src/lib.rs | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/pool.toml b/config/pool.toml
index c2641cfd5..4cb412874 100644
--- a/config/pool.toml
+++ b/config/pool.toml
@@ -18,3 +18,6 @@ port = 34254
 
 [proxy]
 port = 34255
+
+[wallet]
+mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
diff --git a/roles/mint/src/main.rs b/roles/mint/src/main.rs
index 19ee94125..0f0b789e6 100644
--- a/roles/mint/src/main.rs
+++ b/roles/mint/src/main.rs
@@ -112,8 +112,8 @@ async fn main() -> Result<()> {
     pub const HASH_DERIVATION_PATH: u32 = 1337;
     const NUM_KEYS: u8 = 64;
 
-    // TODO securely import mnemonic
-    let mnemonic = Mnemonic::generate(12).unwrap();
+    let mnemonic = Mnemonic::from_str(&global_config.wallet.mnemonic)
+        .map_err(|e| anyhow::anyhow!("Invalid mnemonic in config: {}", e))?;
 
     let hash_currency_unit = CurrencyUnit::Custom(HASH_CURRENCY_UNIT.to_string());
 
@@ -372,4 +372,4 @@ async fn delete_key(
             tracing::warn!("Failed to delete key '{}': {:?}", key, e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/roles/roles-utils/config/src/lib.rs b/roles/roles-utils/config/src/lib.rs
index 8e0eeb813..6f52598dc 100644
--- a/roles/roles-utils/config/src/lib.rs
+++ b/roles/roles-utils/config/src/lib.rs
@@ -51,6 +51,7 @@ pub struct PoolGlobalConfig {
     pub mint: MintConfig,
     pub pool: PoolConfig,
     pub proxy: ProxyConfig,
+    pub wallet: WalletConfig,
 }
 
 impl PoolGlobalConfig {

From 0f7294703f6b143da113322e137a70c1751cb50f Mon Sep 17 00:00:00 2001
From: Machu Pikacchu <177660647+machuPikacchuBTC@users.noreply.github.com>
Date: Thu, 12 Jun 2025 18:27:34 +0000
Subject: [PATCH 2/2] Use mint specific config

---
 config/pool.toml                    | 3 ---
 roles/mint/src/main.rs              | 4 ++--
 roles/roles-utils/config/src/lib.rs | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/pool.toml b/config/pool.toml
index 4cb412874..c2641cfd5 100644
--- a/config/pool.toml
+++ b/config/pool.toml
@@ -18,6 +18,3 @@ port = 34254
 
 [proxy]
 port = 34255
-
-[wallet]
-mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
diff --git a/roles/mint/src/main.rs b/roles/mint/src/main.rs
index 0f0b789e6..6eedf074d 100644
--- a/roles/mint/src/main.rs
+++ b/roles/mint/src/main.rs
@@ -112,8 +112,8 @@ async fn main() -> Result<()> {
     pub const HASH_DERIVATION_PATH: u32 = 1337;
     const NUM_KEYS: u8 = 64;
 
-    let mnemonic = Mnemonic::from_str(&global_config.wallet.mnemonic)
-        .map_err(|e| anyhow::anyhow!("Invalid mnemonic in config: {}", e))?;
+    let mnemonic = Mnemonic::from_str(&mint_settings.info.mnemonic)
+        .map_err(|e| anyhow::anyhow!("Invalid mnemonic in mint config: {}", e))?;
 
     let hash_currency_unit = CurrencyUnit::Custom(HASH_CURRENCY_UNIT.to_string());
 
diff --git a/roles/roles-utils/config/src/lib.rs b/roles/roles-utils/config/src/lib.rs
index 6f52598dc..8e0eeb813 100644
--- a/roles/roles-utils/config/src/lib.rs
+++ b/roles/roles-utils/config/src/lib.rs
@@ -51,7 +51,6 @@ pub struct PoolGlobalConfig {
     pub mint: MintConfig,
     pub pool: PoolConfig,
     pub proxy: ProxyConfig,
-    pub wallet: WalletConfig,
 }
 
 impl PoolGlobalConfig {