Slate binary/base64 encoding

controller/src/command.rs

@@ -32,10 +32,10 @@ use crate::config::WalletConfig;
 use crate::error::{Error, ErrorKind};
 use crate::impls::{
 	instantiate_wallet, FileWalletCommAdapter, HTTPWalletCommAdapter, KeybaseWalletCommAdapter,
-	LMDBBackend, NullWalletCommAdapter,
+	LMDBBackend, NullWalletCommAdapter, StdioWalletCommAdapter,
 };
 use crate::impls::{HTTPNodeClient, WalletSeed};
-use crate::libwallet::{InitTxArgs, IssueInvoiceTxArgs, NodeClient, WalletInst};
+use crate::libwallet::{InitTxArgs, IssueInvoiceTxArgs, NodeClient, Slate, WalletInst};
 use crate::{controller, display};
 
 /// Arguments common to all wallet commands
@@ -296,6 +296,7 @@ pub fn send(
 				"file" => FileWalletCommAdapter::new(),
 				"keybase" => KeybaseWalletCommAdapter::new(),
 				"self" => NullWalletCommAdapter::new(),
+				"string" => StdioWalletCommAdapter::new(),
 				_ => NullWalletCommAdapter::new(),
 			};
 			if adapter.supports_sync() {
@@ -337,6 +338,7 @@ pub fn send(
 
 /// Receive command argument
 pub struct ReceiveArgs {
+	pub method: String,
 	pub input: String,
 	pub message: Option<String>,
 }
@@ -346,7 +348,11 @@ pub fn receive(
 	g_args: &GlobalArgs,
 	args: ReceiveArgs,
 ) -> Result<(), Error> {
-	let adapter = FileWalletCommAdapter::new();
+	let adapter = match args.method.as_str() {
+		"file" => FileWalletCommAdapter::new(),
+		"string" => StdioWalletCommAdapter::new(),
+		_ => NullWalletCommAdapter::new(),
+	};
 	let mut slate = adapter.receive_tx_async(&args.input)?;
 	controller::foreign_single_use(wallet, |api| {
 		if let Err(e) = api.verify_slate_messages(&slate) {
@@ -358,15 +364,18 @@ pub fn receive(
 	})?;
 	let send_tx = format!("{}.response", args.input);
 	adapter.send_tx_async(&send_tx, &slate)?;
-	info!(
-		"Response file {}.response generated, and can be sent back to the transaction originator.",
-		args.input
-	);
+	if args.method.as_str() == "file" {
+		info!(
+			"Response file {}.response generated, sending it back to the transaction originator.",
+			args.input
+		);
+	}
 	Ok(())
 }
 
 /// Finalize command args
 pub struct FinalizeArgs {
+	pub method: String,
 	pub input: String,
 	pub fluff: bool,
 }
@@ -375,7 +384,11 @@ pub fn finalize(
 	wallet: Arc<Mutex<WalletInst<impl NodeClient + 'static, keychain::ExtKeychain>>>,
 	args: FinalizeArgs,
 ) -> Result<(), Error> {
-	let adapter = FileWalletCommAdapter::new();
+	let adapter = match args.method.as_str() {
+		"file" => FileWalletCommAdapter::new(),
+		"string" => StdioWalletCommAdapter::new(),
+		_ => NullWalletCommAdapter::new(),
+	};
 	let mut slate = adapter.receive_tx_async(&args.input)?;
 	// Rather than duplicating the entire command, we'll just
 	// try to determine what kind of finalization this is
@@ -436,6 +449,7 @@ pub fn finalize(
 pub struct IssueInvoiceArgs {
 	/// output file
 	pub dest: String,
+	pub method: String,
 	/// issue invoice tx args
 	pub issue_args: IssueInvoiceTxArgs,
 }
@@ -446,9 +460,14 @@ pub fn issue_invoice_tx(
 ) -> Result<(), Error> {
 	controller::owner_single_use(wallet.clone(), |api| {
 		let slate = api.issue_invoice_tx(args.issue_args)?;
-		let mut tx_file = File::create(args.dest.clone())?;
-		tx_file.write_all(json::to_string(&slate).unwrap().as_bytes())?;
-		tx_file.sync_all()?;
+		let adapter = match args.method.as_str() {
+			"file" => FileWalletCommAdapter::new(),
+			"string" => StdioWalletCommAdapter::new(),
+			_ => NullWalletCommAdapter::new(),
+		};
+
+		adapter.send_tx_async(args.dest.as_str(), &slate)?;
+
 		Ok(())
 	})?;
 	Ok(())
@@ -462,7 +481,8 @@ pub struct ProcessInvoiceArgs {
 	pub method: String,
 	pub dest: String,
 	pub max_outputs: usize,
-	pub input: String,
+	pub target_slate_version: Option<u16>,
+	pub slate: Slate,
 	pub estimate_selection_strategies: bool,
 }
 
@@ -472,8 +492,7 @@ pub fn process_invoice(
 	args: ProcessInvoiceArgs,
 	dark_scheme: bool,
 ) -> Result<(), Error> {
-	let adapter = FileWalletCommAdapter::new();
-	let slate = adapter.receive_tx_async(&args.input)?;
+	let slate = args.slate.clone();
 	controller::owner_single_use(wallet.clone(), |api| {
 		if args.estimate_selection_strategies {
 			let strategies = vec!["smallest", "all"]
@@ -530,6 +549,7 @@ pub fn process_invoice(
 				"http" => HTTPWalletCommAdapter::new(),
 				"file" => FileWalletCommAdapter::new(),
 				"self" => NullWalletCommAdapter::new(),
+				"string" => StdioWalletCommAdapter::new(),
 				_ => NullWalletCommAdapter::new(),
 			};
 			if adapter.supports_sync() {

impls/Cargo.toml

@@ -25,6 +25,7 @@ tokio-core = "0.1"
 tokio-retry = "0.1"
 uuid = { version = "0.7", features = ["serde", "v4"] }
 chrono = { version = "0.4.4", features = ["serde"] }
+base64 = "0.9"
 
 grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
 

impls/src/adapters/mod.rs

@@ -16,15 +16,18 @@ mod file;
 mod http;
 mod keybase;
 mod null;
+mod stdio;
 
 pub use self::file::FileWalletCommAdapter;
 pub use self::http::HTTPWalletCommAdapter;
 pub use self::keybase::KeybaseWalletCommAdapter;
 pub use self::null::NullWalletCommAdapter;
+pub use self::stdio::StdioWalletCommAdapter;
 
 use crate::config::WalletConfig;
 use crate::libwallet::{Error, Slate};
 use std::collections::HashMap;
+extern crate base64;
 
 /// Encapsulate wallet to wallet communication functions
 pub trait WalletCommAdapter {

impls/src/adapters/stdio.rs

@@ -0,0 +1,78 @@
+// Copyright 2018 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.
+
+/// Standard Input/Output 'plugin' implementation
+use std::io::{stdin, Read};
+
+use crate::base64;
+use crate::config::WalletConfig;
+use crate::libwallet::{Error, ErrorKind, Slate};
+use crate::WalletCommAdapter;
+use std::collections::HashMap;
+
+#[derive(Clone)]
+pub struct StdioWalletCommAdapter {}
+
+impl StdioWalletCommAdapter {
+	/// Create
+	pub fn new() -> Box<dyn WalletCommAdapter> {
+		Box::new(StdioWalletCommAdapter {})
+	}
+}
+
+impl WalletCommAdapter for StdioWalletCommAdapter {
+	fn supports_sync(&self) -> bool {
+		false
+	}
+
+	fn send_tx_sync(&self, _dest: &str, _slate: &Slate) -> Result<Slate, Error> {
+		unimplemented!();
+	}
+
+	fn send_tx_async(&self, _dest: &str, slate: &Slate) -> Result<(), Error> {
+		let bytes = slate.to_bytes()?;
+		println!("{}", base64::encode(&bytes));
+		Ok(())
+	}
+
+	fn receive_tx_async(&self, params: &str) -> Result<Slate, Error> {
+		let params = params.trim();
+		// if user passed the string as input decode that, else
+		// read from stdin
+		let b64string = match params {
+			"" => {
+				let mut stream = stdin();
+				let mut content = String::new();
+				stream.read_to_string(&mut content)?;
+				content
+			}
+			_ => params.to_owned(),
+		};
+
+		let bytes = base64::decode(b64string.as_bytes()).map_err(|_| ErrorKind::SlateDeser)?;
+		let slate = Slate::from_bytes(&bytes)?;
+		Ok(slate)
+	}
+
+	fn listen(
+		&self,
+		_params: HashMap<String, String>,
+		_config: WalletConfig,
+		_passphrase: &str,
+		_account: &str,
+		_node_api_secret: Option<String>,
+	) -> Result<(), Error> {
+		unimplemented!();
+	}
+}

impls/src/lib.rs

@@ -29,6 +29,7 @@ use grin_wallet_util::grin_core as core;
 use grin_wallet_util::grin_keychain as keychain;
 use grin_wallet_util::grin_store as store;
 use grin_wallet_util::grin_util as util;
+extern crate base64;
 extern crate grin_wallet_config as config;
 
 mod adapters;
@@ -40,7 +41,7 @@ pub mod test_framework;
 
 pub use crate::adapters::{
 	FileWalletCommAdapter, HTTPWalletCommAdapter, KeybaseWalletCommAdapter, NullWalletCommAdapter,
-	WalletCommAdapter,
+	StdioWalletCommAdapter, WalletCommAdapter,
 };
 pub use crate::backends::{wallet_db_exists, LMDBBackend};
 pub use crate::error::{Error, ErrorKind};

libwallet/src/lib.rs

@@ -38,8 +38,8 @@ extern crate serde_derive;
 extern crate log;
 #[macro_use]
 extern crate lazy_static;
-
 extern crate strum;
+
 #[macro_use]
 extern crate strum_macros;