multi: Update LDK to v0.0.111

Author: MaxFangX

.cargo/config.toml

@@ -4,3 +4,15 @@ runner = "run-sgx-cargo"
 # Build with AES-NI intrinsics required at compile time. Needed by `aes` crate
 # to avoid runtime feature detection (which doesn't work in an SGX enclave).
 rustflags = ["-Ctarget-feature=+aes,+ssse3"]
+
+# FIXME(max): Remove once ld is working without it again
+# [target.x86_64-apple-darwin]
+# rustflags = [
+#   "-C", "link-arg=-undefined",
+#   "-C", "link-arg=dynamic_lookup",
+# ]
+# [target.aarch64-apple-darwin]
+# rustflags = [
+#   "-C", "link-arg=-undefined",
+#   "-C", "link-arg=dynamic_lookup",
+# ]

Cargo.lock

@@ -13,16 +13,16 @@ edition = "2021"
 [dependencies]
 # --- BITCOIN --- #
 
-bitcoin = { version = "0.28.1", features = ["std", "use-serde"] }
+bitcoin = { version = "0.29", features = ["std", "serde"] }
 bitcoin-bech32 = "0.12"
 base64 = "0.13.0"
 
 # --- LIGHTNING --- #
 
-lightning = { version = "0.0.110", features = ["max_level_trace"] }
-# lightning-block-sync = { version = "0.0.110", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.18" }
-# lightning-net-tokio = { version = "0.0.110" }
+lightning = { version = "0.0.111", features = ["max_level_trace"] }
+# lightning-block-sync = { version = "0.0.111", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.19" }
+# lightning-net-tokio = { version = "0.0.111" }
 
 # lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = ["max_level_trace"], branch = "main" }
 # lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", features = [ "rpc-client" ], branch = "main" }

common/Cargo.toml

@@ -115,7 +115,7 @@ impl RootSeed {
             .ckd_priv(&secp_ctx, child_number)
             .expect("should never fail")
             .private_key;
-        KeyPair::from_secret_key(&secp_ctx, node_sk)
+        KeyPair::from_secret_key(&secp_ctx, &node_sk)
     }
 
     /// Derive the Lightning node pubkey.

common/src/root_seed.rs

@@ -19,17 +19,17 @@ common = { path = "../common" }
 
 # --- BITCOIN --- #
 
-bitcoin = { version = "0.28.1", features = ["use-serde"] }
+bitcoin = { version = "0.29", features = ["serde"] }
 bitcoin-bech32 = "0.12"
 # bech32 = "0.8"
 base64 = "0.13.0"
 
 # --- LIGHTNING --- #
 
-lightning = { version = "0.0.110", features = ["max_level_trace"] }
-lightning-block-sync = { version = "0.0.110", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.18" }
-lightning-net-tokio = { version = "0.0.110" }
+lightning = { version = "0.0.111", features = ["max_level_trace"] }
+lightning-block-sync = { version = "0.0.111", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.19" }
+lightning-net-tokio = { version = "0.0.111" }
 
 # lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = # ["max_level_trace"], branch = "main" }
 # lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", # features = [ "rpc-client" ], branch = "main" }

lexe-ln/Cargo.toml

@@ -21,17 +21,17 @@ lexe-ln = { path = "../lexe-ln" }
 
 # --- BITCOIN --- #
 
-bitcoin = { version = "0.28.1", features = ["use-serde"] }
+bitcoin = { version = "0.29", features = ["serde"] }
 bitcoin-bech32 = "0.12"
 # bech32 = "0.8"
 base64 = "0.13.0"
 
 # --- LIGHTNING --- #
 
-lightning = { version = "0.0.110", features = ["max_level_trace"] }
-lightning-block-sync = { version = "0.0.110", features = [ "rpc-client" ] }
-lightning-invoice = { version = "0.18" }
-lightning-net-tokio = { version = "0.0.110" }
+lightning = { version = "0.0.111", features = ["max_level_trace"] }
+lightning-block-sync = { version = "0.0.111", features = [ "rpc-client" ] }
+lightning-invoice = { version = "0.19" }
+lightning-net-tokio = { version = "0.0.111" }
 
 # lightning = { git = "https://github.com/lexe-tech/rust-lightning", features = # ["max_level_trace"], branch = "main" }
 # lightning-block-sync = { git = "https://github.com/lexe-tech/rust-lightning", # features = [ "rpc-client" ], branch = "main" }
@@ -122,7 +122,7 @@ tokio = { version = "=1.15.0", default-features = false, features = [
 
 [target.'cfg(not(target_env = "sgx"))'.dev-dependencies]
 # Run bitcoin regtest for tests
-bitcoind = { version = "0.26", features = [ "22_0" ] }
+bitcoind = { version = "0.27", features = [ "22_0" ] }
 # Enable all default features outside SGX for better test convenience
 proptest = "1"
 

node/Cargo.toml

@@ -29,6 +29,7 @@ use lightning::chain;
 use lightning::chain::chainmonitor::ChainMonitor;
 use lightning::chain::keysinterface::KeysInterface;
 use lightning::chain::transaction::OutPoint;
+use lightning::onion_message::OnionMessenger;
 use lightning::routing::gossip::P2PGossipSync;
 use lightning_invoice::payment;
 use lightning_invoice::utils::DefaultRouter;
@@ -223,12 +224,17 @@ impl UserNode {
             scorer_res.context("Could not read probabilistic scorer")?;
         let scorer = Arc::new(Mutex::new(scorer));
 
+        // Init onion messenger
+        let onion_messenger =
+            Arc::new(OnionMessenger::new(keys_manager.clone(), logger.clone()));
+
         // Initialize PeerManager
         let peer_manager = NodePeerManager::init(
             rng,
             &keys_manager,
             channel_manager.clone(),
             gossip_sync.clone(),
+            onion_messenger,
             logger.clone(),
         );
 

node/src/init.rs

@@ -80,6 +80,9 @@ const CHANNEL_HANDSHAKE_CONFIG: ChannelHandshakeConfig =
         // so that it is possible to sweep all funds to an address
         // specified at the time of channel close.
         commit_upfront_shutdown_pubkey: false,
+        // The counterparty must reserve 1% of the total channel value to be
+        // claimable by us on-chain in the case of a channel breach.
+        their_channel_reserve_proportional_millionths: 10_000,
     };
 
 const CHANNEL_HANDSHAKE_LIMITS: ChannelHandshakeLimits =