From 959755d705b18d13a8dbdf0502c47818fe7a4e94 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 14:34:03 -0700 Subject: [PATCH 1/6] Conditional upload --- .github/workflows/rust.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 422cf60..3f634ac 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -30,11 +30,19 @@ jobs: with: command: test args: --verbose --release --all - - name: Upload + - name: Upload ubuntu/macos uses: actions/upload-artifact@v1 + if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') with: name: ${{ matrix.os }}-zecwallet-cli path: target/release/zecwallet-cli + - name: Upload windows + uses: actions/upload-artifact@v1 + if: contains(matrix.os, 'windows') + with: + name: ${{ matrix.os }}-zecwallet-cli.exe + path: target/release/zecwallet-cli.exe + linux_arm7: name: Linux ARMv7 From 66da04b40b1308c421b344e58daf6c4cf885d8e5 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 15:09:42 -0700 Subject: [PATCH 2/6] Build on ubuntu 1604 --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3f634ac..55461db 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-16.04, windows-latest, macOS-latest] steps: - uses: actions/checkout@v1 From cb5c55a8295a6c22d8e21cbde4476d96435b97cc Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 17:03:44 -0700 Subject: [PATCH 3/6] Add checkpoints --- lib/src/lightclient.rs | 28 ++++------ lib/src/lightclient/checkpoints.rs | 85 ++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 18 deletions(-) create mode 100644 lib/src/lightclient/checkpoints.rs diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index 0d17f8a..8e80cc8 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -25,6 +25,8 @@ use crate::grpcconnector::{self, *}; use crate::SaplingParams; use crate::ANCHOR_OFFSET; +mod checkpoints; + pub const DEFAULT_SERVER: &str = "https://lightd-main.zecwallet.co:443"; pub const WALLET_NAME: &str = "zecwallet-light-wallet.dat"; pub const LOGFILE_NAME: &str = "zecwallet-light-wallet.debug.log"; @@ -117,18 +119,8 @@ impl LightClientConfig { log_path.into_boxed_path() } - pub fn get_initial_state(&self) -> Option<(u64, &str, &str)> { - match &self.chain_name[..] { - "test" => Some((600000, - "0107385846c7451480912c294b6ce1ee1feba6c2619079fd9104f6e71e4d8fe7", - "01690698411e3f8badea7da885e556d7aba365a797e9b20b44ac0946dced14b23c001001ab2a18a5a86aa5d77e43b69071b21770b6fe6b3c26304dcaf7f96c0bb3fed74d000186482712fa0f2e5aa2f2700c4ed49ef360820f323d34e2b447b78df5ec4dfa0401a332e89a21afb073cb1db7d6f07396b56a95e97454b9bca5a63d0ebc575d3a33000000000001c9d3564eff54ebc328eab2e4f1150c3637f4f47516f879a0cfebdf49fe7b1d5201c104705fac60a85596010e41260d07f3a64f38f37a112eaef41cd9d736edc5270145e3d4899fcd7f0f1236ae31eafb3f4b65ad6b11a17eae1729cec09bd3afa01a000000011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39" - )), - "main" => Some((610000, - "000000000218882f481e3b49ca3df819734b8d74aac91f69e848d7499b34b472", - "0192943f1eca6525cea7ea8e26b37c792593ed50cfe2be7a1ff551a08dc64b812f001000000001deef7ae5162a9942b4b9aa797137c5bdf60750e9548664127df99d1981dda66901747ad24d5daf294ce2a27aba923e16e52e7348eea3048c5b5654b99ab0a371200149d8aff830305beb3887529f6deb150ab012916c3ce88a6b47b78228f8bfeb3f01ff84a89890cfae65e0852bc44d9aa82be2c5d204f5aebf681c9e966aa46f540e000001d58f1dfaa9db0996996129f8c474acb813bfed452d347fb17ebac2e775e209120000000001319312241b0031e3a255b0d708750b4cb3f3fe79e3503fe488cc8db1dd00753801754bb593ea42d231a7ddf367640f09bbf59dc00f2c1d2003cc340e0c016b5b13" - )), - _ => None - } + pub fn get_initial_state(&self, height: u64) -> Option<(u64, &str, &str)> { + checkpoints::get_closest_checkpoint(&self.chain_name, height) } pub fn get_server_or_default(server: Option) -> http::Uri { @@ -213,10 +205,10 @@ pub struct LightClient { impl LightClient { - pub fn set_wallet_initial_state(&self) { + pub fn set_wallet_initial_state(&self, height: u64) { use std::convert::TryInto; - let state = self.config.get_initial_state(); + let state = self.config.get_initial_state(height); match state { Some((height, hash, tree)) => self.wallet.read().unwrap().set_initial_block(height.try_into().unwrap(), hash, tree), @@ -242,7 +234,7 @@ impl LightClient { sapling_spend : vec![] }; - l.set_wallet_initial_state(); + l.set_wallet_initial_state(0); l.read_sapling_params(); info!("Created new wallet!"); @@ -266,7 +258,7 @@ impl LightClient { sapling_spend : vec![] }; - l.set_wallet_initial_state(); + l.set_wallet_initial_state(latest_block); l.read_sapling_params(); info!("Created new wallet with a new seed!"); @@ -288,7 +280,7 @@ impl LightClient { sapling_spend : vec![] }; - l.set_wallet_initial_state(); + l.set_wallet_initial_state(latest_block); l.read_sapling_params(); info!("Created new wallet!"); @@ -727,7 +719,7 @@ impl LightClient { self.wallet.read().unwrap().clear_blocks(); // Then set the initial block - self.set_wallet_initial_state(); + self.set_wallet_initial_state(self.wallet.read().unwrap().get_birthday()); // Then, do a sync, which will force a full rescan from the initial state let response = self.do_sync(true); diff --git a/lib/src/lightclient/checkpoints.rs b/lib/src/lightclient/checkpoints.rs new file mode 100644 index 0000000..cf140f3 --- /dev/null +++ b/lib/src/lightclient/checkpoints.rs @@ -0,0 +1,85 @@ +pub fn get_closest_checkpoint(chain_name: &str, height: u64) -> Option<(u64, &'static str, &'static str)> { + match chain_name { + "test" => get_test_checkpoint(height), + "main" => get_main_checkpoint(height), + _ => None + } +} + +fn get_test_checkpoint(height: u64) -> Option<(u64, &'static str, &'static str)> { + let checkpoints: Vec<(u64, &str, &str)> = vec![ + (600000, "0107385846c7451480912c294b6ce1ee1feba6c2619079fd9104f6e71e4d8fe7", + "01690698411e3f8badea7da885e556d7aba365a797e9b20b44ac0946dced14b23c001001ab2a18a5a86aa5d77e43b69071b21770b6fe6b3c26304dcaf7f96c0bb3fed74d000186482712fa0f2e5aa2f2700c4ed49ef360820f323d34e2b447b78df5ec4dfa0401a332e89a21afb073cb1db7d6f07396b56a95e97454b9bca5a63d0ebc575d3a33000000000001c9d3564eff54ebc328eab2e4f1150c3637f4f47516f879a0cfebdf49fe7b1d5201c104705fac60a85596010e41260d07f3a64f38f37a112eaef41cd9d736edc5270145e3d4899fcd7f0f1236ae31eafb3f4b65ad6b11a17eae1729cec09bd3afa01a000000011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39" + ) + ]; + + find_checkpoint(height, checkpoints) +} + + +fn get_main_checkpoint(height: u64) -> Option<(u64, &'static str, &'static str)> { + let checkpoints: Vec<(u64, &str, &str)> = vec![ + (610000, "000000000218882f481e3b49ca3df819734b8d74aac91f69e848d7499b34b472", + "0192943f1eca6525cea7ea8e26b37c792593ed50cfe2be7a1ff551a08dc64b812f001000000001deef7ae5162a9942b4b9aa797137c5bdf60750e9548664127df99d1981dda66901747ad24d5daf294ce2a27aba923e16e52e7348eea3048c5b5654b99ab0a371200149d8aff830305beb3887529f6deb150ab012916c3ce88a6b47b78228f8bfeb3f01ff84a89890cfae65e0852bc44d9aa82be2c5d204f5aebf681c9e966aa46f540e000001d58f1dfaa9db0996996129f8c474acb813bfed452d347fb17ebac2e775e209120000000001319312241b0031e3a255b0d708750b4cb3f3fe79e3503fe488cc8db1dd00753801754bb593ea42d231a7ddf367640f09bbf59dc00f2c1d2003cc340e0c016b5b13" + ) + ]; + + find_checkpoint(height, checkpoints) +} + +fn find_checkpoint(height: u64, chkpts: Vec<(u64, &'static str, &'static str)>) -> Option<(u64, &'static str, &'static str)> { + // Find the closest checkpoint + let mut heights = chkpts.iter().map(|(h, _, _)| *h as u64).collect::>(); + heights.sort(); + + match get_first_lower_than(height, heights) { + Some(closest_height) => { + chkpts.iter().find(|(h, _, _)| *h == closest_height).map(|t| *t) + }, + None => None + } +} + +fn get_first_lower_than(height: u64, heights: Vec) -> Option { + // If it's before the first checkpoint, return None. + if heights.len() == 0 || height < heights[0] { + return None; + } + + for (i, h) in heights.iter().enumerate() { + if height < *h { + return Some(heights[i-1]); + } + } + + return Some(*heights.last().unwrap()); +} + +#[cfg(test)] +pub mod tests { + use super::*; + + #[test] + fn test_lower_than() { + assert_eq!(get_first_lower_than( 9, vec![10, 30, 40]), None); + assert_eq!(get_first_lower_than(10, vec![10, 30, 40]).unwrap(), 10); + assert_eq!(get_first_lower_than(11, vec![10, 30, 40]).unwrap(), 10); + assert_eq!(get_first_lower_than(29, vec![10, 30, 40]).unwrap(), 10); + assert_eq!(get_first_lower_than(30, vec![10, 30, 40]).unwrap(), 30); + assert_eq!(get_first_lower_than(40, vec![10, 30, 40]).unwrap(), 40); + assert_eq!(get_first_lower_than(41, vec![10, 30, 40]).unwrap(), 40); + assert_eq!(get_first_lower_than(99, vec![10, 30, 40]).unwrap(), 40); + } + + #[test] + fn test_checkpoints() { + assert_eq!(get_test_checkpoint(500000), None); + assert_eq!(get_test_checkpoint(600000).unwrap().0, 600000); + assert_eq!(get_test_checkpoint(625000).unwrap().0, 600000); + + assert_eq!(get_main_checkpoint(500000), None); + assert_eq!(get_main_checkpoint(610000).unwrap().0, 610000); + assert_eq!(get_main_checkpoint(625000).unwrap().0, 610000); + } + +} \ No newline at end of file From adba18e13bd181980af0784f6c548593961f6cd9 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 21:03:11 -0700 Subject: [PATCH 4/6] Add new testnet checkpoint --- lib/src/lightclient/checkpoints.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/src/lightclient/checkpoints.rs b/lib/src/lightclient/checkpoints.rs index cf140f3..61e7e69 100644 --- a/lib/src/lightclient/checkpoints.rs +++ b/lib/src/lightclient/checkpoints.rs @@ -10,6 +10,9 @@ fn get_test_checkpoint(height: u64) -> Option<(u64, &'static str, &'static str) let checkpoints: Vec<(u64, &str, &str)> = vec![ (600000, "0107385846c7451480912c294b6ce1ee1feba6c2619079fd9104f6e71e4d8fe7", "01690698411e3f8badea7da885e556d7aba365a797e9b20b44ac0946dced14b23c001001ab2a18a5a86aa5d77e43b69071b21770b6fe6b3c26304dcaf7f96c0bb3fed74d000186482712fa0f2e5aa2f2700c4ed49ef360820f323d34e2b447b78df5ec4dfa0401a332e89a21afb073cb1db7d6f07396b56a95e97454b9bca5a63d0ebc575d3a33000000000001c9d3564eff54ebc328eab2e4f1150c3637f4f47516f879a0cfebdf49fe7b1d5201c104705fac60a85596010e41260d07f3a64f38f37a112eaef41cd9d736edc5270145e3d4899fcd7f0f1236ae31eafb3f4b65ad6b11a17eae1729cec09bd3afa01a000000011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39" + ), + (650000, "003f7e09a357a75c3742af1b7e1189a9038a360cebb9d55e158af94a1c5aa682", + "010113f257f93a40e25cfc8161022f21c06fa2bc7fb03ee9f9399b3b30c636715301ef5b99706e40a19596d758bf7f4fd1b83c3054557bf7fab4801985642c317d41100001b2ad599fd7062af72bea99438dc5d8c3aa66ab52ed7dee3e066c4e762bd4e42b0001599dd114ec6c4c5774929a342d530bf109b131b48db2d20855afa9d37c92d6390000019159393c84b1bf439d142ed2c54ee8d5f7599a8b8f95e4035a75c30b0ec0fa4c0128e3a018bd08b2a98ed8b6995826f5857a9dc2777ce6af86db1ae68b01c3c53d0000000001e3ec5d790cc9acc2586fc6e9ce5aae5f5aba32d33e386165c248c4a03ec8ed670000011f8322ef806eb2430dc4a7a41c1b344bea5be946efc7b4349c1c9edb14ff9d39" ) ]; @@ -76,6 +79,8 @@ pub mod tests { assert_eq!(get_test_checkpoint(500000), None); assert_eq!(get_test_checkpoint(600000).unwrap().0, 600000); assert_eq!(get_test_checkpoint(625000).unwrap().0, 600000); + assert_eq!(get_test_checkpoint(650000).unwrap().0, 650000); + assert_eq!(get_test_checkpoint(655000).unwrap().0, 650000); assert_eq!(get_main_checkpoint(500000), None); assert_eq!(get_main_checkpoint(610000).unwrap().0, 610000); From 11bc928f8d130c28f17b65324dd85f2dba1911df Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Tue, 22 Oct 2019 21:03:23 -0700 Subject: [PATCH 5/6] Need birthday while restoring seed --- cli/src/main.rs | 38 ++++++++++++++++++++++++++++++-------- lib/src/lightclient.rs | 27 +++++++++++++++++++-------- lib/src/lightwallet.rs | 12 ++++++++---- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/cli/src/main.rs b/cli/src/main.rs index a9f96ae..48574ef 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -61,6 +61,11 @@ pub fn main() { .value_name("seed_phrase") .help("Create a new wallet with the given 24-word seed phrase. Will fail if wallet already exists") .takes_value(true)) + .arg(Arg::with_name("birthday") + .long("birthday") + .value_name("birthday") + .help("Specify wallet birthday when restoring from seed. This is the earlist block height where the wallet has a transaction.") + .takes_value(true)) .arg(Arg::with_name("server") .long("server") .value_name("server") @@ -112,8 +117,25 @@ pub fn main() { let command = matches.value_of("COMMAND"); let params = matches.values_of("PARAMS").map(|v| v.collect()).or(Some(vec![])).unwrap(); - let maybe_server = matches.value_of("server").map(|s| s.to_string()); - let seed = matches.value_of("seed").map(|s| s.to_string()); + let maybe_server = matches.value_of("server").map(|s| s.to_string()); + + let seed = matches.value_of("seed").map(|s| s.to_string()); + let maybe_birthday = matches.value_of("birthday"); + + if seed.is_some() && maybe_birthday.is_none() { + eprintln!("ERROR!"); + eprintln!("Please specify the wallet birthday (eg. '--birthday 600000') to restore from seed."); + eprintln!("This should be the block height where the wallet was created. If you don't remember the block height, you can pass '--birthday 0' to scan from the start of the blockchain."); + return; + } + + let birthday = match maybe_birthday.unwrap_or("0").parse::() { + Ok(b) => b, + Err(e) => { + eprintln!("Couldn't parse birthday. This should be a block number. Error={}", e); + return; + } + }; let server = LightClientConfig::get_server_or_default(maybe_server); @@ -125,7 +147,7 @@ pub fn main() { let dangerous = matches.is_present("dangerous"); let nosync = matches.is_present("nosync"); - let (command_tx, resp_rx) = match startup(server, dangerous, seed, !nosync, command.is_none()) { + let (command_tx, resp_rx) = match startup(server, dangerous, seed, birthday, !nosync, command.is_none()) { Ok(c) => c, Err(e) => { eprintln!("Error during startup: {}", e); @@ -163,7 +185,7 @@ pub fn main() { } } -fn startup(server: http::Uri, dangerous: bool, seed: Option, first_sync: bool, print_updates: bool) +fn startup(server: http::Uri, dangerous: bool, seed: Option, birthday: u64, first_sync: bool, print_updates: bool) -> io::Result<(Sender<(String, Vec)>, Receiver)> { // Try to get the configuration let (config, latest_block_height) = LightClientConfig::create(server.clone(), dangerous)?; @@ -175,7 +197,7 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option, first_sync: })?; let lightclient = match seed { - Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, latest_block_height)?), + Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, birthday)?), None => { if config.wallet_exists() { Arc::new(LightClient::read_from_disk(&config)?) @@ -195,9 +217,6 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option, first_sync: println!("Lightclient connecting to {}", config.server); } - // Start the command loop - let (command_tx, resp_rx) = command_loop(lightclient.clone()); - // At startup, run a sync. if first_sync { let update = lightclient.do_sync(true); @@ -206,6 +225,9 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option, first_sync: } } + // Start the command loop + let (command_tx, resp_rx) = command_loop(lightclient.clone()); + Ok((command_tx, resp_rx)) } diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index 8e80cc8..0be799d 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -3,7 +3,7 @@ use crate::lightwallet::LightWallet; use log::{info, warn, error}; use rand::{rngs::OsRng, seq::SliceRandom}; -use std::sync::{Arc, RwLock}; +use std::sync::{Arc, RwLock, Mutex}; use std::sync::atomic::{AtomicU64, AtomicI32, AtomicUsize, Ordering}; use std::path::{Path, PathBuf}; use std::fs::File; @@ -201,6 +201,8 @@ pub struct LightClient { // zcash-params pub sapling_output : Vec, pub sapling_spend : Vec, + + sync_lock : Mutex<()>, } impl LightClient { @@ -231,7 +233,8 @@ impl LightClient { wallet : Arc::new(RwLock::new(LightWallet::new(Some(seed_phrase), &config, 0)?)), config : config.clone(), sapling_output : vec![], - sapling_spend : vec![] + sapling_spend : vec![], + sync_lock : Mutex::new(()), }; l.set_wallet_initial_state(0); @@ -255,7 +258,8 @@ impl LightClient { wallet : Arc::new(RwLock::new(LightWallet::new(None, config, latest_block)?)), config : config.clone(), sapling_output : vec![], - sapling_spend : vec![] + sapling_spend : vec![], + sync_lock : Mutex::new(()), }; l.set_wallet_initial_state(latest_block); @@ -267,20 +271,22 @@ impl LightClient { Ok(l) } - pub fn new_from_phrase(seed_phrase: String, config: &LightClientConfig, latest_block: u64) -> io::Result { + pub fn new_from_phrase(seed_phrase: String, config: &LightClientConfig, birthday: u64) -> io::Result { if config.wallet_exists() { return Err(Error::new(ErrorKind::AlreadyExists, "Cannot create a new wallet from seed, because a wallet already exists")); } let mut l = LightClient { - wallet : Arc::new(RwLock::new(LightWallet::new(Some(seed_phrase), config, latest_block)?)), + wallet : Arc::new(RwLock::new(LightWallet::new(Some(seed_phrase), config, birthday)?)), config : config.clone(), sapling_output : vec![], - sapling_spend : vec![] + sapling_spend : vec![], + sync_lock : Mutex::new(()), }; - l.set_wallet_initial_state(latest_block); + println!("Setting birthday to {}", birthday); + l.set_wallet_initial_state(birthday); l.read_sapling_params(); info!("Created new wallet!"); @@ -302,7 +308,8 @@ impl LightClient { wallet : Arc::new(RwLock::new(wallet)), config : config.clone(), sapling_output : vec![], - sapling_spend : vec![] + sapling_spend : vec![], + sync_lock : Mutex::new(()), }; lc.read_sapling_params(); @@ -729,6 +736,10 @@ impl LightClient { } pub fn do_sync(&self, print_updates: bool) -> String { + // We can only do one sync at a time because we sync blocks in serial order + // If we allow multiple syncs, they'll all get jumbled up. + let _lock = self.sync_lock.lock().unwrap(); + // Sync is 3 parts // 1. Get the latest block // 2. Get all the blocks that we don't have diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs index 6cf8c2b..df1d1c1 100644 --- a/lib/src/lightwallet.rs +++ b/lib/src/lightwallet.rs @@ -358,8 +358,8 @@ impl LightWallet { })?; utils::write_string(&mut writer, &self.config.chain_name)?; - // While writing the birthday, be sure that we're right, and that we don't - // have a tx that is before the current birthday + // While writing the birthday, get it from the fn so we recalculate it properly + // in case of rescans etc... writer.write_u64::(self.get_birthday())?; Ok(()) @@ -373,7 +373,11 @@ impl LightWallet { } pub fn get_birthday(&self) -> u64 { - cmp::min(self.get_first_tx_block(), self.birthday) + if self.birthday == 0 { + self.get_first_tx_block() + } else { + cmp::min(self.get_first_tx_block(), self.birthday) + } } // Get the first block that this wallet has a tx in. This is often used as the wallet's "birthday" @@ -386,7 +390,7 @@ impl LightWallet { .collect::>(); blocks.sort(); - *blocks.first() // Returns optional + *blocks.first() // Returns optional, so if there's no txns, it'll get the activation height .unwrap_or(&cmp::max(self.birthday, self.config.sapling_activation_height)) } From f6e87caf516a7fc4e5164c51b915db01c74453f2 Mon Sep 17 00:00:00 2001 From: DenioD Date: Wed, 23 Oct 2019 15:00:38 +0200 Subject: [PATCH 6/6] merged manually --- .github/workflows/rust.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index abc5ddd..fd6c66f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -34,31 +34,15 @@ jobs: uses: actions/upload-artifact@v1 if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') with: -<<<<<<< HEAD -<<<<<<< HEAD name: ${{ matrix.os }}-silentdragonlite-cli path: target/release/silentdragonlite-cli -======= - name: ${{ matrix.os }}-silentdragonlite-cli - path: target/release/silentdragonlite-cli -======= - name: ${{ matrix.os }}-zecwallet-cli - path: target/release/zecwallet-cli ->>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94 - name: Upload windows uses: actions/upload-artifact@v1 if: contains(matrix.os, 'windows') with: -<<<<<<< HEAD name: ${{ matrix.os }}-silentdragonlite-cli.exe path: target/release/silentdragonlite-cli.exe ->>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94 -======= - name: ${{ matrix.os }}-zecwallet-cli.exe - path: target/release/zecwallet-cli.exe - ->>>>>>> 959755d705b18d13a8dbdf0502c47818fe7a4e94 linux_arm7: name: Linux ARMv7