Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
args: "--target aarch64-apple-darwin"
- platform: "macos-latest" # for Intel based macs.
args: "--target x86_64-apple-darwin"
- platform: "ubuntu-20.04"
- platform: "ubuntu-22.04"
args: ""
- platform: "windows-latest"
args: ""
Expand All @@ -41,7 +41,7 @@ jobs:
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04' # This must match the platform value defined above.
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libudev-dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
args: "--target aarch64-apple-darwin"
- platform: "macos-latest" # for Intel based macs.
args: "--target x86_64-apple-darwin"
- platform: "ubuntu-20.04"
- platform: "ubuntu-22.04"
args: ""
- platform: "windows-latest"
args: ""
Expand All @@ -41,7 +41,7 @@ jobs:
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libudev-dev
Expand Down
1,359 changes: 492 additions & 867 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "keeper-desktop",
"private": true,
"version": "0.2.1",
"version": "0.2.3",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down Expand Up @@ -51,6 +51,6 @@
"tar": "^7.4.3",
"tsx": "^4.19.1",
"typescript": "^5.2.2",
"vite": "^5.4.8"
"vite": "^6.3.2"
}
}
94 changes: 16 additions & 78 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "keeper-desktop"
version = "0.2.1"
version = "0.2.3"
description = "Bitcoin Keeper Desktop App"
authors = ["Ben Kaufman"]
repository = "https://github.com/bithyve/keeper-desktop"
Expand All @@ -23,8 +23,8 @@ hex = "0.4.3"
log = "0.4"
thiserror = "1.0"
env_logger = "0.10"
bitcoin = { version = "0.31", features = ["serde", "base64"] }
async-hwi = "0.0.25"
bitcoin = { version = "0.32", features = ["serde", "base64"] }
async-hwi = "0.0.27"
x25519-dalek = "2.0.1"

[features]
Expand Down
7 changes: 5 additions & 2 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ async fn hwi_sign_tx(
)
.await?;

let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;

if hwi_state.device_type != HWIDeviceType::Coldcard {
let is_registered = device
.is_wallet_registered(&wallet_name.clone().unwrap_or_default(), &policy)
Expand Down Expand Up @@ -274,10 +276,11 @@ async fn hwi_sign_tx(
.await?;
}
}
} else {
// Coldcard change verification gives an error when xpubs are included for Miniscript scheme
psbt_obj.xpub.clear();
}

let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;

device
.sign_tx(&mut psbt_obj)
.await
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"package": {
"productName": "Keeper Desktop (Dev)",
"version": "0.2.1"
"version": "0.2.3"
},
"tauri": {
"allowlist": {
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.release.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Keeper Desktop",
"version": "0.2.1"
"version": "0.2.3"
},
"tauri": {
"allowlist": {
Expand Down