From 4c7a600071093b4c61508b4b89f29a3a0bc25eee Mon Sep 17 00:00:00 2001
From: Conor Schaefer <conor@penumbralabs.xyz>
Date: Fri, 15 Nov 2024 13:22:38 -0800
Subject: [PATCH] chore: update f4jumble to 0.1.0

Updates the old git dependency to a suitable published version from
crates.io. Refs #4921.
---
 Cargo.lock                      | 5 +++--
 crates/core/keys/Cargo.toml     | 2 +-
 crates/core/keys/src/address.rs | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5850522187..230c20859a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2066,8 +2066,9 @@ dependencies = [
 
 [[package]]
 name = "f4jumble"
-version = "0.0.0"
-source = "git+https://github.com/zcash/librustzcash?rev=2425a0869098e3b0588ccd73c42716bcf418612c#2425a0869098e3b0588ccd73c42716bcf418612c"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a83e8d7fd0c526af4aad893b7c9fe41e2699ed8a776a6c74aecdeafe05afc75"
 dependencies = [
  "blake2b_simd 1.0.2",
 ]
diff --git a/crates/core/keys/Cargo.toml b/crates/core/keys/Cargo.toml
index 9fcb49719e..d4f1aa23bd 100644
--- a/crates/core/keys/Cargo.toml
+++ b/crates/core/keys/Cargo.toml
@@ -27,7 +27,7 @@ decaf377-ka = {workspace = true}
 decaf377-rdsa = {workspace = true}
 derivative = {workspace = true}
 ethnum = {workspace = true}
-f4jumble = { git = "https://github.com/zcash/librustzcash", rev = "2425a0869098e3b0588ccd73c42716bcf418612c" }
+f4jumble = "0.1.0"
 hex = {workspace = true}
 hmac = "0.12.0"
 ibig = {workspace = true}
diff --git a/crates/core/keys/src/address.rs b/crates/core/keys/src/address.rs
index 3a136151b5..4251e40e78 100644
--- a/crates/core/keys/src/address.rs
+++ b/crates/core/keys/src/address.rs
@@ -363,8 +363,7 @@ impl TryFrom<&[u8]> for Address {
             anyhow::bail!("address malformed");
         }
 
-        let unjumbled_bytes =
-            f4jumble_inv(jumbled_bytes).ok_or_else(|| anyhow::anyhow!("invalid address"))?;
+        let unjumbled_bytes = f4jumble_inv(jumbled_bytes).context("invalid address")?;
         let mut bytes = Cursor::new(unjumbled_bytes);
 
         let mut diversifier_bytes = [0u8; 16];