GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Serve up web wallet application (#1367)

Browse Source 
* first addition of static wallet file server

* rustfmt

* add custom build functions to download and untar particular release of the web-wallet

* rustfmt

* remove comments
This commit is contained in:
Yeastplume
2018-08-17 18:51:50 +01:00
committed by GitHub
parent adeaea4622
commit 103c9cda77
9 changed files with 660 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/cmd/wallet.rs
+29 -19
View File
@@ -13,7 +13,6 @@
// limitations under the License.
/// Wallet commands processing
use std::process::exit;
use std::sync::{Arc, Mutex};
use std::thread;
@@ -23,9 +22,10 @@ use clap::ArgMatches;
use config::GlobalConfig;
use core::core;
use grin_wallet::{self, libwallet, controller, display};
use grin_wallet::{self, controller, display, libwallet};
use grin_wallet::{HTTPWalletClient, LMDBBackend, WalletConfig, WalletInst, WalletSeed};
use keychain;
use servers::start_webwallet_server;
use util::LOGGER;
pub fn init_wallet_seed(wallet_config: WalletConfig) {
@@ -132,6 +132,16 @@ pub fn wallet_command(wallet_args: &ArgMatches, global_config: GlobalConfig) {
)
});
}
("web", Some(_api_args)) => {
// start owner listener and run static file server
start_webwallet_server();
controller::owner_listener(wallet, "127.0.0.1:13420").unwrap_or_else(|e| {
panic!(
"Error creating wallet api listener: {:?} Config: {:?}",
e, wallet_config
)
});
}
_ => {}
};
}
@@ -233,7 +243,9 @@ pub fn wallet_command(wallet_args: &ArgMatches, global_config: GlobalConfig) {
let priv_file = send_args
.value_of("private")
.expect("Private transaction file required");
let slate = api.file_finalize_tx(priv_file, tx_file).expect("Finalize failed");
let slate = api
.file_finalize_tx(priv_file, tx_file)
.expect("Finalize failed");
let result = api.post_tx(&slate, fluff);
match result {
@@ -279,13 +291,12 @@ pub fn wallet_command(wallet_args: &ArgMatches, global_config: GlobalConfig) {
("outputs", Some(_)) => {
let (height, _) = api.node_height()?;
let (validated, outputs) = api.retrieve_outputs(show_spent, true, None)?;
let _res =
display::outputs(height, validated, outputs).unwrap_or_else(|e| {
panic!(
"Error getting wallet outputs: {:?} Config: {:?}",
e, wallet_config
)
});
let _res = display::outputs(height, validated, outputs).unwrap_or_else(|e| {
panic!(
"Error getting wallet outputs: {:?} Config: {:?}",
e, wallet_config
)
});
Ok(())
}
("txs", Some(txs_args)) => {
@@ -299,8 +310,8 @@ pub fn wallet_command(wallet_args: &ArgMatches, global_config: GlobalConfig) {
let (height, _) = api.node_height()?;
let (validated, txs) = api.retrieve_txs(true, tx_id)?;
let include_status = !tx_id.is_some();
let _res = display::txs(height, validated, txs, include_status)
.unwrap_or_else(|e| {
let _res =
display::txs(height, validated, txs, include_status).unwrap_or_else(|e| {
panic!(
"Error getting wallet outputs: {} Config: {:?}",
e, wallet_config
@@ -310,13 +321,12 @@ pub fn wallet_command(wallet_args: &ArgMatches, global_config: GlobalConfig) {
// inputs/outputs
if tx_id.is_some() {
let (_, outputs) = api.retrieve_outputs(true, false, tx_id)?;
let _res =
display::outputs(height, validated, outputs).unwrap_or_else(|e| {
panic!(
"Error getting wallet outputs: {} Config: {:?}",
e, wallet_config
)
});
let _res = display::outputs(height, validated, outputs).unwrap_or_else(|e| {
panic!(
"Error getting wallet outputs: {} Config: {:?}",
e, wallet_config
)
});
};
Ok(())
}