Merge pull request #1203 from get10101/random-stuff

Random patches
get10101 · Sep 1, 2023 · 8e22da2 · 8e22da2
2 parents 5d4c0ec + c3c4400
commit 8e22da2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 29 deletions.
diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml
@@ -77,7 +77,6 @@ path = "../crates/orderbook-commons"
 
 [dependencies.parking_lot]
 version = "0.12.1"
-features = ["deadlock_detection"]
 
 [dependencies.rust_decimal]
 version = "1"

diff --git a/crates/ln-dlc-node/Cargo.toml b/crates/ln-dlc-node/Cargo.toml
@@ -30,7 +30,7 @@ lightning-persister = { version = "0.0.114" }
 lightning-transaction-sync = { version = "0.0.114", features = ["esplora-blocking"] }
 log = "0.4.17"
 p2pd-oracle-client = { version = "0.1.0" }
-parking_lot = { version = "0.12.1", features = ["deadlock_detection"] }
+parking_lot = { version = "0.12.1" }
 rand = "0.8.5"
 reqwest = { version = "0.11", default-features = false, features = ["json"] }
 rust-bitcoin-coin-selection = { version = "0.1.0", features = ["rand"] }

diff --git a/crates/ln-dlc-node/src/node/mod.rs b/crates/ln-dlc-node/src/node/mod.rs
@@ -486,8 +486,6 @@ where
             self.keys_manager.clone(),
         ));
 
-        std::thread::spawn(monitor_for_deadlocks());
-
         tracing::info!("Lightning node started with node ID {}", self.info);
 
         Ok(RunningNode { _handles: handles })
@@ -573,25 +571,6 @@ fn spawn_background_processor(
     remote_handle
 }
 
-/// Parking lot mutexes have the ability to mark deadlocks.
-///
-/// Take advantage of this behaviour and log deadlocks when they occur.
-fn monitor_for_deadlocks() -> impl Fn() {
-    move || loop {
-        let deadlocks = parking_lot::deadlock::check_deadlock();
-
-        for (i, threads) in deadlocks.iter().enumerate() {
-            tracing::error!(%i, "Deadlock detected");
-            for t in threads {
-                tracing::error!(thread_id = %t.thread_id());
-                tracing::error!("{:#?}", t.backtrace());
-            }
-        }
-
-        std::thread::sleep(Duration::from_secs(10));
-    }
-}
-
 async fn lightning_wallet_sync(
     channel_manager: Arc<ChannelManager>,
     chain_monitor: Arc<ChainMonitor>,

diff --git a/mobile/lib/features/wallet/create_invoice_screen.dart b/mobile/lib/features/wallet/create_invoice_screen.dart
@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:get_10101/bridge_generated/bridge_definitions.dart' as bridge;
 import 'package:get_10101/common/amount_text.dart';
 import 'package:get_10101/common/amount_text_input_form_field.dart';
 import 'package:get_10101/common/application/channel_info_service.dart';
@@ -57,6 +58,10 @@ class _CreateInvoiceScreenState extends State<CreateInvoiceScreen> {
   void initState() {
     final ChannelInfoService channelInfoService = context.read<ChannelInfoService>();
     initChannelInfo(channelInfoService);
+
+    final bridge.Config config = context.read<bridge.Config>();
+    amount = config.network == "regtest" ? Amount(100000) : null;
+
     super.initState();
   }
 

diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
@@ -223,13 +223,16 @@ class _TenTenOneAppState extends State<TenTenOneApp> {
     init(config);
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await initFirebase();
-      await requestNotificationPermission();
-      final flutterLocalNotificationsPlugin = initLocalNotifications();
-      await configureFirebase(flutterLocalNotificationsPlugin);
+      try {
+        await initFirebase();
+        await requestNotificationPermission();
+        final flutterLocalNotificationsPlugin = initLocalNotifications();
+        await configureFirebase(flutterLocalNotificationsPlugin);
+      } catch (e) {
+        FLog.error(text: "Error setting up Firebase: ${e.toString()}");
+      }
 
       PackageInfo packageInfo = await PackageInfo.fromPlatform();
-
       final messenger = scaffoldMessengerKey.currentState!;
 
       try {

diff --git a/mobile/native/Cargo.toml b/mobile/native/Cargo.toml
@@ -26,7 +26,7 @@ ln-dlc-node = { path = "../../crates/ln-dlc-node" }
 openssl = { version = "0.10.55", features = ["vendored"] }
 orderbook-client = { path = "../../crates/orderbook-client" }
 orderbook-commons = { path = "../../crates/orderbook-commons" }
-parking_lot = { version = "0.12.1", features = ["deadlock_detection"] }
+parking_lot = { version = "0.12.1" }
 reqwest = { version = "0.11", default-features = false, features = ["json"] }
 rust_decimal = { version = "1", features = ["serde-with-float"] }
 serde = { version = "1.0.152", features = ["serde_derive"] }