Skip to content

Commit 1b99f41

Browse files
jmgilmanjmgilman
committed
Merge branch 'main' into migrate-cache
2 parents b6fe6cd + 2d171dd commit 1b99f41

File tree

120 files changed

+1480
-629
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1480
-629
lines changed

‎.prettierrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/g77c5dnwa9idf7mx6lmgd3lvsz5jg3kh-prettierrc

‎.std/automation/devshells/dev/shell-profile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shell-profile-5-link

‎.std/automation/devshells/dev/shell-profile-1-link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/drkh2j6wkl3w4xbz9wwgi8n856zn1ijx-Catalyst-Core

‎.std/automation/devshells/dev/shell-profile-2-link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/702h0vcyxycwvv3kpkh724zvnnqs9kxi-Catalyst-Core

‎.std/automation/devshells/dev/shell-profile-3-link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/ivbw2wlzkhh0f3i8fjxclgdw7273w5jg-Catalyst-Core

‎.std/automation/devshells/dev/shell-profile-4-link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/drkh2j6wkl3w4xbz9wwgi8n856zn1ijx-Catalyst-Core

‎.std/automation/devshells/dev/shell-profile-5-link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/ivbw2wlzkhh0f3i8fjxclgdw7273w5jg-Catalyst-Core

‎Cargo.lock‎

Lines changed: 43 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lefthook.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nix/store/h99yaz97zjz38mnx9d6idkm1d60z16v6-lefthook.yml

‎src/catalyst-toolbox/catalyst-toolbox/src/bin/cli/kedqr/decode/img.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::path::Path;
1111
use std::path::PathBuf;
1212

1313
pub fn save_secret_from_qr(qr: PathBuf, output: Option<PathBuf>, pin: QrPin) -> Result<(), Report> {
14-
let sk = secret_from_qr(&qr, pin)?;
14+
let sk = secret_from_qr(qr, pin)?;
1515
let hrp = Ed25519Extended::SECRET_BECH32_HRP;
1616
let secret_key = bech32::encode(hrp, sk.leak_secret().to_base32(), Variant::Bech32)?;
1717

0 commit comments

Comments
 (0)