Update to latest librustzcash revision (SQUASH BEFORE MERGE)

Electric-Coin-Company · Dec 9, 2024 · 1f1c94b · 1f1c94b
1 parent 00e7912
commit 1f1c94b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -66,13 +66,13 @@ crate-type = ["staticlib"]
 lto = true
 
 [patch.crates-io]
-zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
-zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "5864680714fa76ff2605d49b1ff8f70e346af154" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_client_sqlite = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
+zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" }
 orchard = { git = "https://github.com/zcash/orchard.git", rev = "bcd08e1d23e70c42a338f3e3f79d6f4c0c219805" }
 sapling-crypto = { git = "https://github.com/zcash/sapling-crypto.git", rev = "42a1de5a20007050fd3169b5da1cc28962dcb258" }
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -32,9 +32,8 @@ use zcash_client_backend::{
         chain::{scan_cached_blocks, CommitmentTreeRoot, ScanSummary},
         scanning::ScanPriority,
         wallet::{
-            create_proposed_transaction_pczt, create_proposed_transactions,
-            decrypt_and_store_transaction, input_selection::GreedyInputSelector, propose_shielding,
-            propose_transfer,
+            create_pczt_from_proposal, create_proposed_transactions, decrypt_and_store_transaction,
+            input_selection::GreedyInputSelector, propose_shielding, propose_transfer,
         },
         Account, AccountBalance, AccountBirthday, Balance, InputSource, SeedRelevance,
         TransactionDataRequest, WalletCommitmentTrees, WalletRead, WalletSummary, WalletWrite,
@@ -2989,7 +2988,7 @@ pub unsafe extern "C" fn zcashlc_create_proposed_transaction_pczt(
             .id();
 
         if proposal.steps().len() == 1 {
-            let pczt = create_proposed_transaction_pczt::<_, _, Infallible, _, Infallible, _>(
+            let pczt = create_pczt_from_proposal::<_, _, Infallible, _, Infallible, _>(
                 &mut db_data,
                 &network,
                 account_id,