-
Notifications
You must be signed in to change notification settings - Fork 133
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Late locking (experimental) * Error on fee change * Improve comments * Fix typo in comment * Add late locking flag to CLI command
- Loading branch information
Showing
14 changed files
with
433 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| // Copyright 2020 The Grin Developers | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //! Tests and experimentations with late locking | ||
| #[macro_use] | ||
| extern crate log; | ||
| extern crate grin_wallet_controller as wallet; | ||
| extern crate grin_wallet_impls as impls; | ||
| extern crate grin_wallet_libwallet as libwallet; | ||
|
|
||
| use self::libwallet::{InitTxArgs, Slate}; | ||
| use impls::test_framework::{self, LocalWalletClient}; | ||
| use std::sync::atomic::Ordering; | ||
| use std::thread; | ||
| use std::time::Duration; | ||
|
|
||
| #[macro_use] | ||
| mod common; | ||
| use common::{clean_output_dir, create_wallet_proxy, setup}; | ||
|
|
||
| /// self send impl | ||
| fn late_lock_test_impl(test_dir: &'static str) -> Result<(), libwallet::Error> { | ||
| // Create a new proxy to simulate server and wallet responses | ||
| let mut wallet_proxy = create_wallet_proxy(test_dir); | ||
| let chain = wallet_proxy.chain.clone(); | ||
| let stopper = wallet_proxy.running.clone(); | ||
|
|
||
| // Create a new wallet test client, and set its queues to communicate with the | ||
| // proxy | ||
| create_wallet_and_add!( | ||
| client1, | ||
| wallet1, | ||
| mask1_i, | ||
| test_dir, | ||
| "wallet1", | ||
| None, | ||
| &mut wallet_proxy, | ||
| false | ||
| ); | ||
| let mask1 = (&mask1_i).as_ref(); | ||
| create_wallet_and_add!( | ||
| client2, | ||
| wallet2, | ||
| mask2_i, | ||
| test_dir, | ||
| "wallet2", | ||
| None, | ||
| &mut wallet_proxy, | ||
| false | ||
| ); | ||
| let mask2 = (&mask2_i).as_ref(); | ||
|
|
||
| // Set the wallet proxy listener running | ||
| thread::spawn(move || { | ||
| if let Err(e) = wallet_proxy.run() { | ||
| error!("Wallet Proxy error: {}", e); | ||
| } | ||
| }); | ||
|
|
||
| // add some accounts | ||
| wallet::controller::owner_single_use(Some(wallet1.clone()), mask1, None, |api, m| { | ||
| api.create_account_path(m, "mining")?; | ||
| api.create_account_path(m, "listener")?; | ||
| Ok(()) | ||
| })?; | ||
|
|
||
| // add some accounts | ||
| wallet::controller::owner_single_use(Some(wallet2.clone()), mask2, None, |api, m| { | ||
| api.create_account_path(m, "account1")?; | ||
| api.create_account_path(m, "account2")?; | ||
| Ok(()) | ||
| })?; | ||
|
|
||
| // Get some mining done | ||
| { | ||
| wallet_inst!(wallet1, w); | ||
| w.set_parent_key_id_by_name("mining")?; | ||
| } | ||
| { | ||
| wallet_inst!(wallet2, w); | ||
| w.set_parent_key_id_by_name("account1")?; | ||
| } | ||
|
|
||
| let bh = 10u64; | ||
| let _ = | ||
| test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, bh as usize, false); | ||
|
|
||
| let mut slate = Slate::blank(2, false); | ||
| let amount = 60_000_000_000; | ||
|
|
||
| wallet::controller::owner_single_use(Some(wallet1.clone()), mask1, None, |sender_api, m| { | ||
| let args = InitTxArgs { | ||
| src_acct_name: Some("mining".to_owned()), | ||
| amount, | ||
| minimum_confirmations: 2, | ||
| max_outputs: 500, | ||
| num_change_outputs: 1, | ||
| selection_strategy_is_use_all: false, | ||
| late_lock: Some(true), | ||
| ..Default::default() | ||
| }; | ||
| let slate_i = sender_api.init_send_tx(m, args)?; | ||
| println!("S1 SLATE: {}", slate_i); | ||
| slate = client1.send_tx_slate_direct("wallet2", &slate_i)?; | ||
| println!("S2 SLATE: {}", slate); | ||
|
|
||
| // Note we don't call `tx_lock_outputs` on the sender side here, | ||
| // as the outputs will only be locked during finalization | ||
|
|
||
| slate = sender_api.finalize_tx(m, &slate)?; | ||
| println!("S3 SLATE: {}", slate); | ||
|
|
||
| Ok(()) | ||
| })?; | ||
|
|
||
| let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, 3, false); | ||
|
|
||
| // update/test contents of both accounts | ||
| wallet::controller::owner_single_use(Some(wallet1.clone()), mask1, None, |api, m| { | ||
| let (wallet1_refreshed, wallet_info) = api.retrieve_summary_info(m, true, 1)?; | ||
| assert!(wallet1_refreshed); | ||
| print!( | ||
| "Wallet 1 amount: {}", | ||
| wallet_info.amount_currently_spendable | ||
| ); | ||
| Ok(()) | ||
| })?; | ||
|
|
||
| wallet::controller::owner_single_use(Some(wallet2.clone()), mask2, None, |api, m| { | ||
| let (wallet2_refreshed, wallet_info) = api.retrieve_summary_info(m, true, 1)?; | ||
| assert!(wallet2_refreshed); | ||
| println!( | ||
| "Wallet 2 amount: {}", | ||
| wallet_info.amount_currently_spendable | ||
| ); | ||
| Ok(()) | ||
| })?; | ||
|
|
||
| // let logging finish | ||
| stopper.store(false, Ordering::Relaxed); | ||
| thread::sleep(Duration::from_millis(200)); | ||
| Ok(()) | ||
| } | ||
|
|
||
| #[test] | ||
| fn late_lock() { | ||
| let test_dir = "test_output/late_lock"; | ||
| setup(test_dir); | ||
| if let Err(e) = late_lock_test_impl(test_dir) { | ||
| panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap()); | ||
| } | ||
| clean_output_dir(test_dir); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.