Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-08-01 12:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pin tokio dependencies

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-22 07:42:43 -07:00
parent f058e0d3d2
commit 9324f7f097
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@@ -29,3 +29,9 @@ RUN cp /usr/x86_64-w64-mingw32/lib/crt2.o /usr/local/rustup/toolchains/1.38.0-x8
# SODIUM_LIB_DIR for windows cross compilation # SODIUM_LIB_DIR for windows cross compilation
RUN cd /opt && wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-mingw.tar.gz && \ RUN cd /opt && wget https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-mingw.tar.gz && \
tar xvf libsodium-1.0.17-mingw.tar.gz tar xvf libsodium-1.0.17-mingw.tar.gz
# Cargo fetch the dependencies so we don't download them over and over again
RUN cd /tmp && git clone https://github.com/adityapk00/zecwallet-light-cli.git && \
cd zecwallet-light-cli && \
cargo fetch && \
cd /tmp && rm -rf zecwallet-light-cli

6
lib/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
tower-grpc = { git = "https://github.com/tower-rs/tower-grpc" } tower-grpc = "0.1.1"
futures = "0.1" futures = "0.1"
bytes = "0.4" bytes = "0.4"
base58 = "0.1.0" base58 = "0.1.0"
@@ -14,7 +14,7 @@ dirs = "2.0.2"
http = "0.1" http = "0.1"
prost = "0.5" prost = "0.5"
tokio = "0.1" tokio = "0.1"
tower-request-modifier = { git = "https://github.com/tower-rs/tower-http" } tower-request-modifier = "0.1.0"
tower-util = "0.1" tower-util = "0.1"
hex = "0.3" hex = "0.3"
protobuf = "2" protobuf = "2"
@@ -31,7 +31,7 @@ tokio-rustls = "0.10.0-alpha.3"
rustls = { version = "0.15.2", features = ["dangerous_configuration"] } rustls = { version = "0.15.2", features = ["dangerous_configuration"] }
webpki = "0.19.1" webpki = "0.19.1"
webpki-roots = "0.16.0" webpki-roots = "0.16.0"
tower-h2 = { git = "https://github.com/tower-rs/tower-h2" } tower-h2 = { git = "https://github.com/tower-rs/tower-h2", rev="0865040d699697bbaf1c3b77b3f256b72f98cdf4" }
rust-embed = { version = "5.1.0", features = ["debug-embed"] } rust-embed = { version = "5.1.0", features = ["debug-embed"] }
rand = "0.7.2" rand = "0.7.2"
sodiumoxide = "0.2.5" sodiumoxide = "0.2.5"

6
lib/src/lightwallet.rs
View File

@@ -1399,9 +1399,9 @@ impl LightWallet {
// Create a map from address -> sk for all taddrs, so we can spend from the // Create a map from address -> sk for all taddrs, so we can spend from the
// right address // right address
let address_to_sk: HashMap<_, _> = self.tkeys.read().unwrap().iter().map(|sk| let address_to_sk = self.tkeys.read().unwrap().iter()
(self.address_from_sk(&sk), sk.clone()) .map(|sk| (self.address_from_sk(&sk), sk.clone()))
).collect(); .collect::<HashMap<_,_>>();
// Add all tinputs // Add all tinputs
tinputs.iter() tinputs.iter()

1
src/main.rs
View File

@@ -317,6 +317,7 @@ fn attempt_recover_seed() {
consensus_branch_id: "000000".to_string(), consensus_branch_id: "000000".to_string(),
anchor_offset: 0, anchor_offset: 0,
no_cert_verification: false, no_cert_verification: false,
data_dir: None,
}; };
let mut reader = BufReader::new(File::open(config.get_wallet_path()).unwrap()); let mut reader = BufReader::new(File::open(config.get_wallet_path()).unwrap());