Merge branch 'master' of github.com:cgilliard/mwc

Author: cgilliard

config/src/config.rs

@@ -39,9 +39,9 @@ use crate::wallet::WalletConfig;
 /// the node config file location
 pub const SERVER_CONFIG_FILE_NAME: &'static str = "mwc-server.toml";
 /// And a wallet configuration file name
-pub const WALLET_CONFIG_FILE_NAME: &'static str = "grin-wallet.toml";
+pub const WALLET_CONFIG_FILE_NAME: &'static str = "mwc-wallet.toml";
 const SERVER_LOG_FILE_NAME: &'static str = "mwc-server.log";
-const WALLET_LOG_FILE_NAME: &'static str = "grin-wallet.log";
+const WALLET_LOG_FILE_NAME: &'static str = "mwc-wallet.log";
 const MWC_HOME: &'static str = ".mwc";
 const MWC_CHAIN_DIR: &'static str = "chain_data";
 /// Wallet data directory

doc/api/api.md

@@ -5,7 +5,7 @@ This document contains the documentation for the 3 Grin REST APIs. These endpoin
 ## Node API
 
 This endpoint is used to query a node about various information on the blockchain, networks and peers. By default, this REST API will listen on `localhost:3413`. This API is started as the same time as the Grin node.
-This endpoint requires, by default, [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). The username is `grin` and the password can be found in the `.api_secret` file.
+This endpoint requires, by default, [Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). The username is `mwc` and the password can be found in the `.api_secret` file.
 To learn about what specific calls can be made read the [node API doc](node_api.md).
 
 ## Wallet APIs
@@ -21,7 +21,7 @@ The wallet owner API is an endpoint to manage the user wallet: broadcast transac
 
 __This endpoint must **never** be exposed to the outside world.__
 
-This endpoint requires, by default, Basic Authentication. The username is `grin` and the password can be found in the `.api_secret` file.
+This endpoint requires, by default, Basic Authentication. The username is `mwc` and the password can be found in the `.api_secret` file.
 To learn about what specific calls can be made read the [wallet owner API doc](wallet_owner_api.md).
 
 ## Ports above 10000?

doc/wallet/tls-setup.md

@@ -10,7 +10,7 @@ If you don't have a static IP you may want to consider using services like DynDN
 If you don't have a domain name there is a possibility to get a TLS certificate for your IP, but you have to pay for that (so perhaps it's cheaper to buy a domain name) and it's rarely supported by certificate providers.
 
 ## I have a TLS certificate already
-Uncomment and update the following lines in wallet config (by default `~/.grin/grin-wallet.toml`):
+Uncomment and update the following lines in wallet config (by default `~/.mwc/mwc-wallet.toml`):
 
 ```toml
 tls_certificate_file = "/path/to/my/cerificate/fullchain.pem"
@@ -29,7 +29,7 @@ Or, in case you are using DynDNS or `localhost` in order to comunicate with your
 api_listen_interface = "0.0.0.0"
 ```
 
-If you have Stratum server enabled (you run a miner) make sure that wallet listener URL starts with `https` in node config (by default `~/.grin/grin-server.toml`):
+If you have Stratum server enabled (you run a miner) make sure that wallet listener URL starts with `https` in node config (by default `~/.mwc/mwc-server.toml`):
 
 ```toml
 wallet_listener_url = "https://grin1.example.com:13415"

servers/src/webwallet/server.rs

@@ -60,7 +60,7 @@ impl MainService {
 		// Set up directory relative to executable for the time being
 		let mut exe_path = env::current_exe().unwrap();
 		exe_path.pop();
-		exe_path.push("grin-wallet");
+		exe_path.push("mwc-wallet");
 		MainService {
 			static_: Static::new(exe_path),
 		}

src/bin/cmd/wallet_args.rs

@@ -195,6 +195,7 @@ pub fn parse_global_args(
 	if args.is_present("show_spent") {
 		show_spent = true;
 	}
+	let owner_api_secret = get_first_line(config.api_secret_path.clone());
 	let node_api_secret = get_first_line(config.node_api_secret_path.clone());
 	let password = match args.value_of("pass") {
 		None => None,
@@ -218,6 +219,7 @@ pub fn parse_global_args(
 	Ok(command::GlobalArgs {
 		account: account.to_owned(),
 		show_spent: show_spent,
+		owner_api_secret: owner_api_secret,
 		node_api_secret: node_api_secret,
 		password: password,
 		tls_conf: tls_conf,

src/bin/cmd/wallet_tests.rs

@@ -59,10 +59,10 @@ mod wallet_tests {
 		current_dir.push(wallet_name);
 		let _ = fs::create_dir_all(current_dir.clone());
 		let mut config_file_name = current_dir.clone();
-		config_file_name.push("grin-wallet.toml");
+		config_file_name.push("mwc-wallet.toml");
 		if config_file_name.exists() {
 			return Err(grin_wallet::ErrorKind::ArgumentError(
-				"grin-wallet.toml already exists in the target directory. Please remove it first"
+				"mwc-wallet.toml already exists in the target directory. Please remove it first"
 					.to_owned(),
 			))?;
 		}
@@ -90,7 +90,7 @@ mod wallet_tests {
 		current_dir.push(wallet_name);
 		let _ = fs::create_dir_all(current_dir.clone());
 		let mut config_file_name = current_dir.clone();
-		config_file_name.push("grin-wallet.toml");
+		config_file_name.push("mwc-wallet.toml");
 		GlobalWalletConfig::new(config_file_name.to_str().unwrap())
 			.unwrap()
 			.members

src/bin/mwc.yml

@@ -275,7 +275,7 @@ subcommands:
             about: Initialize a new wallet seed file and database
             args:
               - here:
-                  help: Create wallet files in the current directory instead of the default ~/.grin directory
+                  help: Create wallet files in the current directory instead of the default ~/.mwc directory
                   short: h
                   long: here
                   takes_value: false

src/build/build.rs

@@ -16,19 +16,20 @@
 
 use built;
 
-use reqwest;
+//use reqwest;
 
-use flate2::read::GzDecoder;
+//use flate2::read::GzDecoder;
 use std::env;
-use std::fs::{self, File};
-use std::io::prelude::*;
-use std::io::Read;
-use std::path::{self, Path, PathBuf};
+//use std::fs::{self, File}
+//use std::io::prelude::*;
+//use std::io::Read;
+//use std::path::{self, Path, PathBuf};
+use std::path::PathBuf;
 use std::process::Command;
 
-use tar::Archive;
+//use tar::Archive;
 
-const _WEB_WALLET_TAG: &str = "0.3.0.1";
+//const _WEB_WALLET_TAG: &str = "0.3.0.1";
 
 fn main() {
 	// Setting up git hooks in the project: rustfmt and so on.
@@ -70,6 +71,7 @@ fn main() {
 	}*/
 }
 
+/*
 fn _download_and_decompress(target_file: &str) -> Result<bool, Box<std::error::Error>> {
 	let req_path = format!("https://github.com/mimblewimble/grin-web-wallet/releases/download/{}/grin-web-wallet.tar.gz", _WEB_WALLET_TAG);
 	let mut resp = reqwest::get(&req_path)?;
@@ -147,4 +149,4 @@ fn _install_web_wallet() -> Result<bool, Box<std::error::Error>> {
 	}
 
 	Ok(true)
-}
+}*/

wallet/src/command.rs

@@ -39,6 +39,7 @@ use crate::{
 #[derive(Clone)]
 pub struct GlobalArgs {
 	pub account: String,
+	pub owner_api_secret: Option<String>,
 	pub node_api_secret: Option<String>,
 	pub show_spent: bool,
 	pub password: Option<ZeroingString>,
@@ -146,7 +147,7 @@ pub fn owner_api(
 	let res = controller::owner_listener(
 		wallet,
 		config.owner_api_listen_addr().as_str(),
-		g_args.node_api_secret.clone(),
+		g_args.owner_api_secret.clone(),
 		g_args.tls_conf.clone(),
 		config.owner_api_include_foreign.clone(),
 	);