mirror of
https://github.com/mimblewimble/grin-wallet.git
synced 2025-01-21 03:21:08 +03:00
9450d2a3b8
* Add support for sending compact slates (#366) * WIP add support for sending compact slates * add repopulate_tx function to internal API * first pass at compacted slate working * move slate compaction to separate function * test fixes * support compact slate inits in invoice workflow * add compress flags to send and invoice * attempting to remove is_compact and assume all V4 slates begin as compact * attempting to calculate offsets when full tx data isn't available * update calc_commit to use participant blind data * update doctests for compact slates * start to remove unneeded fields from serialization * make num_participants optional * remove other_version from slate * use grin master branch * remove message field * lock height assumed to be 0 if it doesn't exist * don't serialise receiver signature when null * don't serialize payment_info if not needed * remove participant id from participant info * add note on id field * fix finalize and receive doctests * finalize_tx tests, init_send_tx tests * doctests for process_invoice_tx, retrieve_tx, tx_lock_outputs * finished test changes * update from grin master * rebuild PR from diff (#380) * recreate PR from diff (#381) * serialize tx struct into top level coms object (#382) * remove height (#383) * Add State Slate (#384) * add state field to slate and SlateV4 * set slate state at each transaction stage, add check to tests * serialize slate status properly * V4 Slate field tweaks (#386) * various tweaks to V4 slate * field renaming * serialize slate v4 ID as base64 (#387) * remove amount and fee where not needed (#388) * Final Changes for compact Slate (#389) * add tests for all types of file output, remove message args * default range proof serialization * shorten output features serialization * rename payment proof fields in slate v4 * v4 payment proof serialization * Binary Slates (#385) * start test implementation * add experimental binary serialization to slate * serialize id * serialize fields that can be skipped as a separate struct * factor out sigs serialization * clean up sigs and coms serialization * completed v4 bin serialization * add manual de/ser traits for V4 bin slate * add simple byte array serializer * complete wiring in of bin slate serialization * clarify comment * clarify comment * update version * test output dir name fix * update slate v4 change description * add binary output to command line * Remove unneeded signature data during S2 and I2 stages (#390) * remove unneeded return signature data during S2 * remove unneeded sig data from I2 * Doctest Fixes for compact slate branch (#392) * begin to fix doctests * more doctest fixes * fix receive_tx * update get_stored_tx to accept an UUID instead of a tx object, and operate on a raw Transaction object (#394) * Fixes to async transaction posting (#395) * unstash post_tx changes * add offset during S3 and I3 * Revert slate id serialization to hex-string uuid (#396) * update from master (#397) * v3.x.x - v4.0.0 wallet compatibility fixes (#398) * changes to support http sending to v3 wallets * sending via http/tor TO 3.0.0 wallet works * receiving FROM 3.0.0 wallets works over http/tor * output converted V3 slate when needed * paying invoices from 3.0.0 wallets working * handle all participant info in slate states * sending and receiving standard file transactions between v3 and 4 wallets confirmed working * all file-based workflows working * fixes resulting from tests * remove reminder warnings * remove lock_height, add kernel_features + arguments (#399) * grin-wallet master now building against grin master (#402) (#403) Co-authored-by: Antioch Peverell <apeverell@protonmail.com> * Enhanced offset creation (#407) * initial tests reworking offset creation * invoice flow fixing + tests * further test fixes * change offset name in v4 slate, base64 serialize * logic optimisation * changes based on review feedback Co-authored-by: Antioch Peverell <apeverell@protonmail.com>
536 lines
13 KiB
Rust
536 lines
13 KiB
Rust
// Copyright 2019 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.
|
|
|
|
//! Test wallet command line works as expected
|
|
#[macro_use]
|
|
extern crate clap;
|
|
|
|
#[macro_use]
|
|
extern crate log;
|
|
|
|
extern crate grin_wallet;
|
|
|
|
use grin_wallet_impls::test_framework::{self, LocalWalletClient, WalletProxy};
|
|
|
|
use clap::App;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
|
|
use grin_wallet_impls::DefaultLCProvider;
|
|
use grin_wallet_util::grin_keychain::ExtKeychain;
|
|
|
|
mod common;
|
|
use common::{clean_output_dir, execute_command, initial_setup_wallet, instantiate_wallet, setup};
|
|
|
|
/// command line tests
|
|
fn command_line_test_impl(test_dir: &str) -> Result<(), grin_wallet_controller::Error> {
|
|
setup(test_dir);
|
|
// Create a new proxy to simulate server and wallet responses
|
|
let mut wallet_proxy: WalletProxy<
|
|
DefaultLCProvider<LocalWalletClient, ExtKeychain>,
|
|
LocalWalletClient,
|
|
ExtKeychain,
|
|
> = WalletProxy::new(test_dir);
|
|
let chain = wallet_proxy.chain.clone();
|
|
|
|
// load app yaml. If it don't exist, just say so and exit
|
|
let yml = load_yaml!("../src/bin/grin-wallet.yml");
|
|
let app = App::from_yaml(yml);
|
|
|
|
// wallet init
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "init", "-h"];
|
|
// should create new wallet file
|
|
let client1 = LocalWalletClient::new("wallet1", wallet_proxy.tx.clone());
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec.clone())?;
|
|
|
|
// trying to init twice - should fail
|
|
assert!(execute_command(&app, test_dir, "wallet1", &client1, arg_vec.clone()).is_err());
|
|
let client1 = LocalWalletClient::new("wallet1", wallet_proxy.tx.clone());
|
|
|
|
// add wallet to proxy
|
|
//let wallet1 = test_framework::create_wallet(&format!("{}/wallet1", test_dir), client1.clone());
|
|
let config1 = initial_setup_wallet(test_dir, "wallet1");
|
|
let wallet_config1 = config1.clone().members.unwrap().wallet;
|
|
let (wallet1, mask1_i) = instantiate_wallet(
|
|
wallet_config1.clone(),
|
|
client1.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
wallet_proxy.add_wallet(
|
|
"wallet1",
|
|
client1.get_send_instance(),
|
|
wallet1.clone(),
|
|
mask1_i.clone(),
|
|
);
|
|
|
|
// Create wallet 2
|
|
let client2 = LocalWalletClient::new("wallet2", wallet_proxy.tx.clone());
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec.clone())?;
|
|
|
|
let config2 = initial_setup_wallet(test_dir, "wallet2");
|
|
let wallet_config2 = config2.clone().members.unwrap().wallet;
|
|
let (wallet2, mask2_i) = instantiate_wallet(
|
|
wallet_config2.clone(),
|
|
client2.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
wallet_proxy.add_wallet(
|
|
"wallet2",
|
|
client2.get_send_instance(),
|
|
wallet2.clone(),
|
|
mask2_i.clone(),
|
|
);
|
|
|
|
// Set the wallet proxy listener running
|
|
thread::spawn(move || {
|
|
if let Err(e) = wallet_proxy.run() {
|
|
error!("Wallet Proxy error: {}", e);
|
|
}
|
|
});
|
|
|
|
// Create some accounts in wallet 1
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "account", "-c", "mining"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"account",
|
|
"-c",
|
|
"account_1",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// Create some accounts in wallet 2
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"account",
|
|
"-c",
|
|
"account_1",
|
|
];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec.clone())?;
|
|
// already exists
|
|
assert!(execute_command(&app, test_dir, "wallet2", &client2, arg_vec).is_err());
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"account",
|
|
"-c",
|
|
"account_2",
|
|
];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// let's see those accounts
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "account"];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// let's see those accounts
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "account"];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// Mine a bit into wallet 1 so we have something to send
|
|
// (TODO: Be able to stop listeners so we can test this better)
|
|
let wallet_config1 = config1.clone().members.unwrap().wallet;
|
|
let (wallet1, mask1_i) =
|
|
instantiate_wallet(wallet_config1, client1.clone(), "password", "default")?;
|
|
let mask1 = (&mask1_i).as_ref();
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet1.clone()),
|
|
mask1,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "mining")?;
|
|
Ok(())
|
|
},
|
|
)?;
|
|
|
|
let mut bh = 10u64;
|
|
let _ =
|
|
test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, bh as usize, false);
|
|
|
|
// Update info and check
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "info"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// try a file exchange
|
|
let file_name = format!("{}/tx1.part_tx", test_dir);
|
|
let response_file_name = format!("{}/tx1.part_tx.response", test_dir);
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"send",
|
|
"-m",
|
|
"file",
|
|
"-d",
|
|
&file_name,
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"account_1",
|
|
"receive",
|
|
"-i",
|
|
&file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec.clone())?;
|
|
|
|
// shouldn't be allowed to receive twice
|
|
assert!(execute_command(&app, test_dir, "wallet2", &client2, arg_vec).is_err());
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-a",
|
|
"mining",
|
|
"-p",
|
|
"password",
|
|
"finalize",
|
|
"-i",
|
|
&response_file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
bh += 1;
|
|
|
|
let wallet_config1 = config1.clone().members.unwrap().wallet;
|
|
let (wallet1, mask1_i) = instantiate_wallet(
|
|
wallet_config1.clone(),
|
|
client1.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
let mask1 = (&mask1_i).as_ref();
|
|
|
|
// Check our transaction log, should have 10 entries
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet1.clone()),
|
|
mask1,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "mining")?;
|
|
let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?;
|
|
assert!(refreshed);
|
|
assert_eq!(txs.len(), bh as usize);
|
|
for t in txs {
|
|
assert!(t.kernel_excess.is_some());
|
|
}
|
|
Ok(())
|
|
},
|
|
)?;
|
|
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, 10, false);
|
|
bh += 10;
|
|
|
|
// update info for each
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "info"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "account_1", "info"];
|
|
execute_command(&app, test_dir, "wallet2", &client1, arg_vec)?;
|
|
|
|
// check results in wallet 2
|
|
let wallet_config2 = config2.clone().members.unwrap().wallet;
|
|
let (wallet2, mask2_i) = instantiate_wallet(
|
|
wallet_config2.clone(),
|
|
client2.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
let mask2 = (&mask2_i).as_ref();
|
|
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet2.clone()),
|
|
mask2,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "account_1")?;
|
|
let (_, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
|
|
assert_eq!(wallet1_info.last_confirmed_height, bh);
|
|
assert_eq!(wallet1_info.amount_currently_spendable, 10_000_000_000);
|
|
Ok(())
|
|
},
|
|
)?;
|
|
|
|
// Self-send to same account, using smallest strategy
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"send",
|
|
"-m",
|
|
"file",
|
|
"-d",
|
|
&file_name,
|
|
"-s",
|
|
"smallest",
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"receive",
|
|
"-i",
|
|
&file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec.clone())?;
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-a",
|
|
"mining",
|
|
"-p",
|
|
"password",
|
|
"finalize",
|
|
"-i",
|
|
&response_file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
bh += 1;
|
|
|
|
// Check our transaction log, should have bh entries + one for the self receive
|
|
let wallet_config1 = config1.clone().members.unwrap().wallet;
|
|
let (wallet1, mask1_i) = instantiate_wallet(
|
|
wallet_config1.clone(),
|
|
client1.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
let mask1 = (&mask1_i).as_ref();
|
|
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet1.clone()),
|
|
mask1,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "mining")?;
|
|
let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?;
|
|
assert!(refreshed);
|
|
assert_eq!(txs.len(), bh as usize + 1);
|
|
Ok(())
|
|
},
|
|
)?;
|
|
|
|
// Try using the self-send method, splitting up outputs for the fun of it
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"send",
|
|
"-m",
|
|
"self",
|
|
"-d",
|
|
"mining",
|
|
"-o",
|
|
"3",
|
|
"-s",
|
|
"smallest",
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
bh += 1;
|
|
|
|
// Check our transaction log, should have bh entries + 2 for the self receives
|
|
let wallet_config1 = config1.clone().members.unwrap().wallet;
|
|
let (wallet1, mask1_i) = instantiate_wallet(
|
|
wallet_config1.clone(),
|
|
client1.clone(),
|
|
"password",
|
|
"default",
|
|
)?;
|
|
let mask1 = (&mask1_i).as_ref();
|
|
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet1.clone()),
|
|
mask1,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "mining")?;
|
|
let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?;
|
|
assert!(refreshed);
|
|
assert_eq!(txs.len(), bh as usize + 2);
|
|
Ok(())
|
|
},
|
|
)?;
|
|
|
|
// Another file exchange, don't send, but unlock with repair command
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"send",
|
|
"-m",
|
|
"file",
|
|
"-d",
|
|
&file_name,
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "scan", "-d"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// Another file exchange, cancel this time
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"send",
|
|
"-m",
|
|
"file",
|
|
"-d",
|
|
&file_name,
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"cancel",
|
|
"-i",
|
|
"26",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// issue an invoice tx, wallet 2
|
|
let file_name = format!("{}/invoice.slate", test_dir);
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"invoice",
|
|
"-d",
|
|
&file_name,
|
|
"-b",
|
|
"65",
|
|
];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
let output_file_name = format!("{}/invoice.slate.paid", test_dir);
|
|
|
|
// now pay the invoice tx, wallet 1
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-a",
|
|
"mining",
|
|
"-p",
|
|
"password",
|
|
"pay",
|
|
"-i",
|
|
&file_name,
|
|
"-d",
|
|
&output_file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// and finalize, wallet 2
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"finalize",
|
|
"-i",
|
|
&output_file_name,
|
|
];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// bit more mining
|
|
let _ = test_framework::award_blocks_to_wallet(&chain, wallet1.clone(), mask1, 5, false);
|
|
//bh += 5;
|
|
|
|
// txs and outputs (mostly spit out for a visual in test logs)
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "txs"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// message output (mostly spit out for a visual in test logs)
|
|
let arg_vec = vec![
|
|
"grin-wallet",
|
|
"-p",
|
|
"password",
|
|
"-a",
|
|
"mining",
|
|
"txs",
|
|
"-i",
|
|
"10",
|
|
];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
// txs and outputs (mostly spit out for a visual in test logs)
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "outputs"];
|
|
execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
|
|
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "txs"];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "outputs"];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// get tx output via -tx parameter
|
|
let mut tx_id = "".to_string();
|
|
grin_wallet_controller::controller::owner_single_use(
|
|
Some(wallet2.clone()),
|
|
mask2,
|
|
None,
|
|
|api, m| {
|
|
api.set_active_account(m, "default")?;
|
|
let (_, txs) = api.retrieve_txs(m, true, None, None)?;
|
|
let some_tx_id = txs[0].tx_slate_id.clone();
|
|
assert!(some_tx_id.is_some());
|
|
tx_id = some_tx_id.unwrap().to_hyphenated().to_string().clone();
|
|
Ok(())
|
|
},
|
|
)?;
|
|
let arg_vec = vec!["grin-wallet", "-p", "password", "txs", "-t", &tx_id[..]];
|
|
execute_command(&app, test_dir, "wallet2", &client2, arg_vec)?;
|
|
|
|
// let logging finish
|
|
thread::sleep(Duration::from_millis(200));
|
|
clean_output_dir(test_dir);
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn wallet_command_line() {
|
|
let test_dir = "target/test_output/command_line";
|
|
if let Err(e) = command_line_test_impl(test_dir) {
|
|
panic!("Libwallet Error: {} - {}", e, e.backtrace().unwrap());
|
|
}
|
|
}
|