Merge pull request #1166 from MutinyWallet/enable-anchors

Enable anchor channels and scid aliases
MutinyWallet · May 7, 2024 · cb64198 · cb64198
2 parents 65a114f + c360af2
commit cb64198
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/mutiny-core/Cargo.toml b/mutiny-core/Cargo.toml
@@ -17,9 +17,9 @@ lnurl-rs = { version = "0.4.0", default-features = false, features = ["async", "
 cfg-if = "1.0.0"
 bip39 = { version = "2.0.0" }
 bitcoin = { version = "0.30.2", default-features = false, features = ["std", "serde", "secp-recovery", "rand"] }
-bdk = { version = "1.0.0-alpha.5" }
-bdk_esplora = { version = "0.7.0", default-features = false, features = ["std", "async-https"] }
-bdk_chain = { version = "0.9.0", features = ["std"] }
+bdk = { version = "=1.0.0-alpha.5" }
+bdk_esplora = { version = "=0.7.0", default-features = false, features = ["std", "async-https"] }
+bdk_chain = { version = "=0.9.0", features = ["std"] }
 bdk-macros = "0.6.0"
 getrandom = { version = "0.2" }
 itertools = "0.11.0"
@@ -64,7 +64,7 @@ base64 = "0.13.0"
 pbkdf2 = "0.11"
 aes-gcm = "0.10.1"
 
-log = "=0.4.18"
+log = "0.4.18"
 futures = "0.3.25"
 thiserror = "1.0"
 anyhow = "1.0"

diff --git a/mutiny-core/src/lib.rs b/mutiny-core/src/lib.rs
@@ -46,6 +46,12 @@ mod test_utils;
 pub use crate::gossip::{GOSSIP_SYNC_TIME_KEY, NETWORK_GRAPH_KEY, PROB_SCORER_KEY};
 pub use crate::keymanager::generate_seed;
 pub use crate::ldkstorage::{CHANNEL_CLOSURE_PREFIX, CHANNEL_MANAGER_KEY, MONITORS_PREFIX_KEY};
+pub use bitcoin;
+pub use fedimint_core;
+pub use lightning;
+pub use lightning_invoice;
+pub use nostr_sdk;
+
 use crate::utils::spawn;
 use crate::{auth::MutinyAuthClient, hermes::HermesClient, logging::MutinyLogger};
 use crate::{blindauth::BlindAuthClient, cashu::CashuHttpClient};

diff --git a/mutiny-core/src/node.rs b/mutiny-core/src/node.rs
@@ -1781,15 +1781,7 @@ impl<S: MutinyStorage> Node<S> {
             .lsp_client
             .as_ref()
             .is_some_and(|l| l.accept_underpaying_htlcs());
-        let mut config = default_user_config(accept_underpaying_htlcs);
-
-        // if we are opening channel to LSP, turn off SCID alias until CLN is updated
-        // LSP protects all invoice information anyways, so no UTXO leakage
-        if let Some(lsp) = self.lsp_client.clone() {
-            if pubkey == lsp.get_lsp_pubkey().await {
-                config.channel_handshake_config.negotiate_scid_privacy = false;
-            }
-        }
+        let config = default_user_config(accept_underpaying_htlcs);
 
         let user_channel_id = user_channel_id.unwrap_or_else(|| {
             // generate random user channel id
@@ -1890,14 +1882,7 @@ impl<S: MutinyStorage> Node<S> {
             .lsp_client
             .as_ref()
             .is_some_and(|l| l.accept_underpaying_htlcs());
-        let mut config = default_user_config(accept_underpaying_htlcs);
-        // if we are opening channel to LSP, turn off SCID alias until CLN is updated
-        // LSP protects all invoice information anyways, so no UTXO leakage
-        if let Some(lsp) = self.lsp_client.clone() {
-            if pubkey == lsp.get_lsp_pubkey().await {
-                config.channel_handshake_config.negotiate_scid_privacy = false;
-            }
-        }
+        let config = default_user_config(accept_underpaying_htlcs);
 
         let user_channel_id = user_chan_id.unwrap_or_else(|| {
             // generate random user channel id
@@ -2364,7 +2349,7 @@ pub(crate) fn default_user_config(accept_underpaying_htlcs: bool) -> UserConfig
             announced_channel: false,
             negotiate_scid_privacy: true,
             commit_upfront_shutdown_pubkey: false,
-            negotiate_anchors_zero_fee_htlc_tx: false,
+            negotiate_anchors_zero_fee_htlc_tx: true, // enable anchor channels
             max_inbound_htlc_value_in_flight_percent_of_channel: 100,
             our_to_self_delay: 6 * 24 * 2, // 2 days
             their_channel_reserve_proportional_millionths: 0,

diff --git a/mutiny-core/src/nodemanager.rs b/mutiny-core/src/nodemanager.rs
@@ -579,6 +579,12 @@ impl<S: MutinyStorage> NodeManager<S> {
     /// Creates a background process that will sync the wallet with the blockchain.
     /// This will also update the fee estimates every 10 minutes.
     pub fn start_sync(nm: Arc<NodeManager<S>>) {
+        // sync every second on regtest, this makes testing easier
+        let sync_interval_secs = match nm.network {
+            Network::Bitcoin | Network::Testnet | Network::Signet => 60,
+            Network::Regtest => 1,
+            net => unreachable!("Unknown network: {net}"),
+        };
         utils::spawn(async move {
             let mut synced = false;
             loop {
@@ -617,8 +623,8 @@ impl<S: MutinyStorage> NodeManager<S> {
                     synced = true;
                 }
 
-                // sleep for 1 minute, checking graceful shutdown check each 1s.
-                for _ in 0..60 {
+                // wait for next sync round, checking graceful shutdown check each second.
+                for _ in 0..sync_interval_secs {
                     if nm.stop.load(Ordering::Relaxed) {
                         return;
                     }