Merge pull request #1665 from get10101/fix/chain-monitor-backwards-in…

…compatibility

Read and write `ChainMonitor` using the same key

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Fix backwards-compatibility of `ChainMonitor`s created before version 1.5.0.
+
 ## [1.6.5] - 2023-11-29
 
 - Add support for Android 9

crates/ln-dlc-storage/src/lib.rs

@@ -39,6 +39,8 @@ use std::string::ToString;
 
 pub mod sled;
 
+// Kinds.
+
 const CONTRACT: u8 = 1;
 const CHANNEL: u8 = 2;
 const CHAIN_MONITOR: u8 = 3;
@@ -48,6 +50,8 @@ const SUB_CHANNEL: u8 = 7;
 const ADDRESS: u8 = 8;
 const ACTION: u8 = 9;
 
+const CHAIN_MONITOR_KEY: &str = "chain_monitor";
+
 pub trait WalletStorage {
     fn upsert_address(&self, address: &Address, privkey: &SecretKey) -> Result<()>;
     fn delete_address(&self, address: &Address) -> Result<()>;
@@ -439,7 +443,7 @@ impl<K: DlcStoreProvider> dlc_manager::Storage for DlcStorageProvider<K> {
         self.store
             .write(
                 CHAIN_MONITOR,
-                "chain_monitor".to_string().into_bytes(),
+                CHAIN_MONITOR_KEY.to_string().into_bytes(),
                 monitor.serialize()?,
             )
             .map_err(|e| Error::StorageError(format!("Error writing chain monitor: {e}")))
@@ -448,7 +452,10 @@ impl<K: DlcStoreProvider> dlc_manager::Storage for DlcStorageProvider<K> {
     fn get_chain_monitor(&self) -> Result<Option<ChainMonitor>, Error> {
         let chain_monitors = self
             .store
-            .read(CHAIN_MONITOR, None)
+            .read(
+                CHAIN_MONITOR,
+                Some(CHAIN_MONITOR_KEY.to_string().into_bytes()),
+            )
             .map_err(|e| Error::StorageError(format!("Error reading chain monitor: {e}")))?;
 
         let serialized = chain_monitors.first();
@@ -1127,14 +1134,27 @@ mod tests {
 
         storage
             .persist_chain_monitor(&chain_monitor)
-            .expect("to be able to persist the chain monistor.");
+            .expect("to be able to persist the chain monitor.");
 
         let retrieved = storage
             .get_chain_monitor()
             .expect("to be able to retrieve the chain monitor.")
             .expect("to have a persisted chain monitor.");
 
         assert_eq!(chain_monitor, retrieved);
+
+        let chain_monitor2 = ChainMonitor::new(456);
+
+        storage
+            .persist_chain_monitor(&chain_monitor2)
+            .expect("to be able to persist the chain monitor.");
+
+        let retrieved2 = storage
+            .get_chain_monitor()
+            .expect("to be able to retrieve the chain monitor.")
+            .expect("to have a persisted chain monitor.");
+
+        assert_eq!(chain_monitor2, retrieved2);
     }
 
     #[test]

crates/tests-e2e/tests/restore_from_backup.rs

@@ -1,13 +1,15 @@
-use anyhow::Result;
 use native::api;
+use native::trade::position::PositionState;
 use tests_e2e::app::run_app;
 use tests_e2e::logger::init_tracing;
 use tests_e2e::setup;
+use tests_e2e::setup::dummy_order;
+use tests_e2e::wait_until;
 use tokio::task::spawn_blocking;
 
 #[tokio::test]
 #[ignore = "need to be run with 'just e2e' command"]
-async fn app_can_be_restored_from_a_backup() -> Result<()> {
+async fn app_can_be_restored_from_a_backup() {
     init_tracing();
 
     let test = setup::TestSetup::new_with_open_position().await;
@@ -34,5 +36,17 @@ async fn app_can_be_restored_from_a_backup() -> Result<()> {
         .await
         .unwrap();
 
-    Ok(())
+    let closing_order = {
+        let mut order = dummy_order();
+        order.direction = api::Direction::Short;
+        order
+    };
+
+    tracing::info!("Closing a position");
+    spawn_blocking(move || api::submit_order(closing_order).unwrap())
+        .await
+        .unwrap();
+
+    wait_until!(test.app.rx.position().unwrap().position_state == PositionState::Closing);
+    wait_until!(test.app.rx.position_close().is_some());
 }

mobile/linux/rust.cmake

@@ -14,7 +14,7 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(Corrosion)
 
-corrosion_import_crate(MANIFEST_PATH ../native/Cargo.toml)
+corrosion_import_crate(MANIFEST_PATH ../native/Cargo.toml CRATES native)
 
 # Flutter-specific