From e9a15fd1aacc0a3c367be6b0031dffc8ef9a9b70 Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Tue, 29 Aug 2023 16:18:24 +0200
Subject: [PATCH 1/2] CHANGELOG: update for v2

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d880b64..7ba76910 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,54 @@
 # Liana daemon and GUI release notes
 
+## 2.0
+
+This release significantly simplifies the installation of Liana. It also fixes a number of small
+bugs and glitches.
+
+### Features
+
+- We made it possible to re-use an xpub within a descriptor, so long as it uses a different
+  derivation path.
+- We added new RPC commands allowing for updating and querying labels of txids, addresses and
+  outpoints.
+- We've made our RPC connection to `bitcoind` more robust.
+- We now distribute packages for Debian-based and Arch-based Linux distributions.
+- A guide on how to recover a Liana wallet backup with Bitcoin Core was added.
+- An example config file for running `lianad` was added.
+- We've worked around the use of prefixed-paths on Windows thereby allowing us to bring back the
+  watchonly wallet at the same location as for other operating systems, under our own datadir.
+
+#### GUI-specific
+
+- The UX for creating a descriptor where a signer is present in different spending paths was
+  significantly improved.
+- The installation process, as well as the usage of the wallet, was made more user friendly by
+  optionally encapsulating the management (download, start and stop) of the `bitcoind`.
+
+### Fixes
+
+- We more gracefully stop the Bitcoin backend poller when the block chain is still in the process of
+  being synchronized. This would previously appear to hang and could freeze the GUI.
+- The handling of conflicting unconfirmed spend transactions (RBFs) was fixed.
+- If paid directly through a coinbase transaction output, the wallet could have previously missed
+  it. This was fixed.
+- We now correctly treat immature coinbase deposits as unspendable. They are otherwise treated
+  similarly to unconfirmed coins.
+- We now tell `bitcoind` to load our watchonly wallet upon startup. Not loading the watchonly wallet
+  on startup could make `bitcoind` unable to load it without reindexing the block chain, if using an
+  aggressive pruning configuration.
+- `lianad` will now print a more helpful message on startup failure (and link to the newly added
+  config file example).
+
+#### GUI-specific
+
+- We now check the network of xpubs when importing a descriptor.
+- The GUI would sometimes fail to connect to the Specter DIY signing device.
+- We now convey the descriptor registration step on a signing device isn't necessary if none were
+  used.
+- We could previously appear to hang during shutdown.
+
+
 ## 1.0
 
 This is the first non-beta release of Liana.

From edb2c513a3fbd6a002ba94425430be8ab34258fd Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Tue, 29 Aug 2023 16:19:41 +0200
Subject: [PATCH 2/2] Bump lianad version to 2.0

---
 Cargo.lock        | 2 +-
 Cargo.toml        | 2 +-
 src/lib.rs        | 2 +-
 tests/test_rpc.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 944211b4..e6cd1dc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -223,7 +223,7 @@ dependencies = [
 
 [[package]]
 name = "liana"
-version = "1.0.0"
+version = "2.0.0"
 dependencies = [
  "backtrace",
  "bip39",
diff --git a/Cargo.toml b/Cargo.toml
index ff8da5ea..c8a46ad1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "liana"
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Antoine Poinsot <darosior@protonmail.com>"]
 edition = "2018"
 repository = "https://github.com/wizardsardine/liana"
diff --git a/src/lib.rs b/src/lib.rs
index b0a577e9..37a68284 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -78,7 +78,7 @@ impl fmt::Display for Version {
 }
 
 pub const VERSION: Version = Version {
-    major: 1,
+    major: 2,
     minor: 0,
     patch: 0,
 };
diff --git a/tests/test_rpc.py b/tests/test_rpc.py
index 7a599945..1d031743 100644
--- a/tests/test_rpc.py
+++ b/tests/test_rpc.py
@@ -20,7 +20,7 @@ from test_framework.utils import (
 
 def test_getinfo(lianad):
     res = lianad.rpc.getinfo()
-    assert res["version"] == "1.0.0-dev"
+    assert res["version"] == "2.0.0-dev"
     assert res["network"] == "regtest"
     wait_for(lambda: lianad.rpc.getinfo()["block_height"] == 101)
     res = lianad.rpc.getinfo()