diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 7c13b19..000cd37 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "blake2b_simd", "byteorder", @@ -1301,7 +1301,7 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "blake2b_simd", ] @@ -2604,7 +2604,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pczt" version = "0.0.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "blake2b_simd", "bls12_381", @@ -5422,7 +5422,7 @@ dependencies = [ [[package]] name = "zcash_address" version = "0.6.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "bech32", "bs58", @@ -5435,7 +5435,7 @@ dependencies = [ [[package]] name = "zcash_client_backend" version = "0.15.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "arti-client", "base64", @@ -5496,7 +5496,7 @@ dependencies = [ [[package]] name = "zcash_client_sqlite" version = "0.13.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "bip32", "bs58", @@ -5534,7 +5534,7 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.1" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "byteorder", "nonempty", @@ -5543,7 +5543,7 @@ dependencies = [ [[package]] name = "zcash_keys" version = "0.5.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "bech32", "bip32", @@ -5584,7 +5584,7 @@ dependencies = [ [[package]] name = "zcash_primitives" version = "0.20.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "aes", "bip32", @@ -5623,7 +5623,7 @@ dependencies = [ [[package]] name = "zcash_proofs" version = "0.20.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "bellman", "blake2b_simd", @@ -5645,7 +5645,7 @@ dependencies = [ [[package]] name = "zcash_protocol" version = "0.4.1" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "document-features", "memuse", @@ -5716,7 +5716,7 @@ dependencies = [ [[package]] name = "zip321" version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=5864680714fa76ff2605d49b1ff8f70e346af154#5864680714fa76ff2605d49b1ff8f70e346af154" +source = "git+https://github.com/zcash/librustzcash.git?rev=0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c#0f4e01cd4a2e38bc8037aecc35ae901a7d6a005c" dependencies = [ "base64", "nom", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a5cbdd6..bde3b3a 100644 --- 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 index d3b464c..0d8f9f8 100644 --- 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,