From ca05bd3fbc2862d3f219491c396b7c1e21b83a99 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 3 Feb 2023 16:11:17 +0100 Subject: [PATCH 1/3] gui: release 0.2 --- gui/Cargo.lock | 6 +++--- gui/Cargo.toml | 2 +- gui/src/lib.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/Cargo.lock b/gui/Cargo.lock index e58bc908..574b8a8a 100644 --- a/gui/Cargo.lock +++ b/gui/Cargo.lock @@ -1639,8 +1639,8 @@ dependencies = [ [[package]] name = "liana" -version = "0.1.0" -source = "git+https://github.com/wizardsardine/liana?branch=master#bd6ecaeb285f780ea94e38e28b2d0860f1b45c97" +version = "0.2.0" +source = "git+https://github.com/wizardsardine/liana?branch=master#8cc6cb1f86df3ee47caff848e331dc9fbc925aae" dependencies = [ "backtrace", "base64", @@ -1658,7 +1658,7 @@ dependencies = [ [[package]] name = "liana_gui" -version = "0.1.0" +version = "0.2.0" dependencies = [ "async-hwi", "backtrace", diff --git a/gui/Cargo.toml b/gui/Cargo.toml index cb79fc76..526eff06 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "liana_gui" -version = "0.1.0" +version = "0.2.0" readme = "README.md" description = "Liana GUI" repository = "https://github.com/revault/liana" diff --git a/gui/src/lib.rs b/gui/src/lib.rs index 3b60c731..082e6287 100644 --- a/gui/src/lib.rs +++ b/gui/src/lib.rs @@ -11,6 +11,6 @@ use liana::Version; pub const VERSION: Version = Version { major: 0, - minor: 1, + minor: 2, patch: 0, }; From 0bd3bd4d2ef8f88bde2f9abbeed8c1d68408801b Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 3 Feb 2023 16:52:06 +0100 Subject: [PATCH 2/3] Update Github links to wizardsardine/liana --- .github/workflows/main.yml | 2 +- CONTRIBUTING.md | 2 +- Cargo.toml | 2 +- README.md | 6 +++--- contrib/reproducible/docker/cargo_config.toml | 4 ++-- contrib/reproducible/guix/build.sh | 4 ++-- doc/TRY.md | 2 +- gui/Cargo.toml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8d39d05..983aded9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: if: matrix.os == 'windows-latest' run: cargo test --verbose --no-default-features - name: Test on Rust ${{ matrix.toolchain }} (non Windows) - # See issue https://github.com/revault/liana/issues/69 + # See issue https://github.com/wizardsardine/liana/issues/69 if: matrix.os != 'windows-latest' && (matrix.os != 'macOS-latest' || matrix.toolchain != '1.48') run: cargo test --verbose --color always -- --nocapture diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1d6a12a0..228df938 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Github issue before going forward with the implementation. ## Looking for contributions If you are looking for first time contributions, you can `git grep` for `FIXME`s and `TODO`s -as well as checking out the [good first issues](https://github.com/revault/liana/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) +as well as checking out the [good first issues](https://github.com/wizardsardine/liana/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) on the issue tracker. diff --git a/Cargo.toml b/Cargo.toml index fa461e2a..c76325a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "liana" version = "0.2.0" authors = ["Antoine Poinsot "] edition = "2018" -repository = "https://github.com/revault/liana" +repository = "https://github.com/wizardsardine/liana" license-file = "LICENCE" keywords = ["bitcoin", "wallet", "safe", "script", "miniscript", "inheritance", "recovery"] description = "Liana wallet daemon" diff --git a/README.md b/README.md index 76e84b32..182ae651 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ your machine yet, you can download it [there](https://bitcoincore.org/en/downloa The recommended installation method for regular users is to download an executable software release. If you prefer to build the project from source, see [`doc/BUILD.md`](doc/BUILD.md) instead. -Head to the [release page](https://github.com/revault/liana/releases) and download the right +Head to the [release page](https://github.com/wizardsardine/liana/releases) and download the right executable for your platform. If you are not sure what is the "right" executable for your platform, choose `liana-0.1.exe` if you are on Windows, `liana-0.1.dmg` if you are on MacOS and `liana-0.1-x86_64-linux-gnu.tar.gz` if you are on Linux. @@ -113,7 +113,7 @@ application: `2.1.0`. This is the minimum supported version, as it's the first o support for Miniscript. If you are using the GUI, it should be intuitive what menu to use depending on your intention. If it -is not, bug report are very welcome so [feel free to report it](https://github.com/revault/liana/issues)! :) +is not, bug report are very welcome so [feel free to report it](https://github.com/wizardsardine/liana/issues)! :) If you are using the daemon, you can use the `liana-cli` binary to send commands to it. It will need the path to the same configuration as the daemon. You can find a full documentation of the JSONRPC @@ -157,7 +157,7 @@ sweep PSBT to the requested address with the specified feerate, filled with all ## About the software project -Liana is an open source project. It is [hosted at Github](https://github.com/revault/liana). +Liana is an open source project. It is [hosted at Github](https://github.com/wizardsardine/liana). Contributions are very welcome. For guidelines, see [CONTRIBUTING.md](CONTRIBUTING.md). diff --git a/contrib/reproducible/docker/cargo_config.toml b/contrib/reproducible/docker/cargo_config.toml index 366c3a00..07998080 100644 --- a/contrib/reproducible/docker/cargo_config.toml +++ b/contrib/reproducible/docker/cargo_config.toml @@ -9,8 +9,8 @@ git = "https://github.com/darosior/rust-miniscript" branch = "multipath_descriptors_on_8.0" replace-with = "vendored_sources" -[source."https://github.com/revault/liana"] -git = "https://github.com/revault/liana" +[source."https://github.com/wizardsardine/liana"] +git = "https://github.com/wizardsardine/liana" branch = "master" replace-with = "vendored_sources" diff --git a/contrib/reproducible/guix/build.sh b/contrib/reproducible/guix/build.sh index d8d6535d..8969f82f 100755 --- a/contrib/reproducible/guix/build.sh +++ b/contrib/reproducible/guix/build.sh @@ -18,8 +18,8 @@ git = "https://github.com/darosior/rust-miniscript" branch = "multipath_descriptors_on_9.0" replace-with = "vendored_sources" -[source."https://github.com/revault/liana"] -git = "https://github.com/revault/liana" +[source."https://github.com/wizardsardine/liana"] +git = "https://github.com/wizardsardine/liana" branch = "master" replace-with = "vendored_sources" EOF diff --git a/doc/TRY.md b/doc/TRY.md index 1e27d61a..a0c055ba 100644 --- a/doc/TRY.md +++ b/doc/TRY.md @@ -126,7 +126,7 @@ Keep the Specter simulator open and move on to the next step. ## Step 3: start Liana -Head to the [release page](https://github.com/revault/liana/releases) and download the right +Head to the [release page](https://github.com/wizardsardine/liana/releases) and download the right executable for your platform. If you are not sure what is the "right" executable for your platform, choose `liana-0.1.exe` if you are on Windows, `liana-0.1.dmg` if you are on MacOS and `liana-0.1-x86_64-linux-gnu.tar.gz` if you are on Linux. diff --git a/gui/Cargo.toml b/gui/Cargo.toml index 526eff06..4763d2ab 100644 --- a/gui/Cargo.toml +++ b/gui/Cargo.toml @@ -3,7 +3,7 @@ name = "liana_gui" version = "0.2.0" readme = "README.md" description = "Liana GUI" -repository = "https://github.com/revault/liana" +repository = "https://github.com/wizardsardine/liana" license = "BSD-3-Clause" authors = ["Edouard Paris "] edition = "2018" From 58a3d21eff766627bde45727f00e101408983602 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 3 Feb 2023 18:00:34 +0100 Subject: [PATCH 3/3] contrib: update the package pins in the repro build Dockerfiles --- contrib/reproducible/docker/macos.Dockerfile | 6 +++--- contrib/reproducible/docker/windows.Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/reproducible/docker/macos.Dockerfile b/contrib/reproducible/docker/macos.Dockerfile index b5dd0073..5113c2b9 100644 --- a/contrib/reproducible/docker/macos.Dockerfile +++ b/contrib/reproducible/docker/macos.Dockerfile @@ -9,8 +9,8 @@ RUN apt update && apt install -y \ make=4.3-4.1 \ libssl-dev=1.1.1n-0+deb11u3 \ liblzma-dev=5.2.5-2.1~deb11u1 \ - libxml2=2.9.10+dfsg-6.7+deb11u2 \ - libxml2-dev=2.9.10+dfsg-6.7+deb11u2 \ + libxml2=2.9.10+dfsg-6.7+deb11u3 \ + libxml2-dev=2.9.10+dfsg-6.7+deb11u3 \ cmake=3.18.4-2+deb11u1 \ git=1:2.30.2-1 \ patch=2.7.6-7 \ @@ -21,7 +21,7 @@ RUN apt update && apt install -y \ libbz2-dev=1.0.8-4 \ xz-utils=5.2.5-2.1~deb11u1 \ bzip2=1.0.8-4 \ - curl=7.74.0-1.3+deb11u3 + curl=7.74.0-1.3+deb11u5 # Download the cargo binary and compiled stdlib from the distributed releases to make sure to build with # the very same toolchain. We use 1.65.0 because it is unfortunately the MSRV of the GUI. diff --git a/contrib/reproducible/docker/windows.Dockerfile b/contrib/reproducible/docker/windows.Dockerfile index b658dc3e..1ea7336a 100644 --- a/contrib/reproducible/docker/windows.Dockerfile +++ b/contrib/reproducible/docker/windows.Dockerfile @@ -6,7 +6,7 @@ WORKDIR /liana # out of our way to pin the whole tree of deps. Instead invest time in getting Guix cross-compilation. RUN apt update && apt install -y \ gcc-mingw-w64-x86-64=10.2.1-6+24.2 \ - curl=7.74.0-1.3+deb11u3 \ + curl=7.74.0-1.3+deb11u5 \ gcc=4:10.2.1-1 # Download the cargo binary and compiled stdlib from the distributed releases to make sure to build with