Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-01-30 18:42:15 +00:00
Code Issues Projects Releases Wiki Activity

update to use u32 consensus id

Browse Source
This commit is contained in:
Cryptoforge 2020-10-12 15:09:14 -07:00
parent ba5411f3c9
commit ca32c63ff4
3 changed files with 1171 additions and 1183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2338
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
lib/Cargo.toml
View File

@ -47,33 +47,33 @@ reqwest = { version = "0.10.8", features = ["blocking", "json"] }
[dependencies.bellman]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
default-features = false
features = ["groth16", "multicore"]
[dependencies.pairing]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
[dependencies.zcash_client_backend]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
default-features = false
[dependencies.zcash_primitives]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
default-features = false
features = ["transparent-inputs"]
[dependencies.zcash_proofs]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
default-features = false
[dependencies.ff]
git = "https://github.com/zerocurrencycoin/librustzcash.git"
rev = "0883d7f3fc26b4f615b049151e43c112c8c7b920"
rev = "2981c4d2860f7cd73282fed885daac0323ff0280"
features = ["ff_derive"]
[build-dependencies]

4
lib/src/lightwallet.rs
View File

@ -4,7 +4,6 @@ use std::cmp;
use std::collections::{HashMap, HashSet};
use std::sync::{Arc, RwLock};
use std::io::{Error, ErrorKind};
use std::convert::TryFrom;
use threadpool::ThreadPool;
use std::sync::mpsc::{channel};
@ -35,7 +34,6 @@ use zcash_primitives::{
jubjub::fs::Fs,
block::BlockHash,
serialize::{Vector},
consensus::BranchId,
transaction::{
builder::{Builder},
components::{Amount, OutPoint, TxOut}, //components::amount::DEFAULT_FEE,
@ -2255,7 +2253,7 @@ impl LightWallet {
println!("{}: Building transaction", now() - start_time);
let (tx, _) = match builder.build(
BranchId::try_from(consensus_branch_id).unwrap(),
consensus_branch_id,
&prover::InMemTxProver::new(spend_params, output_params),
) {
Ok(res) => res,