Merge branch 'master' into master

src/bin/cmd/wallet_args.rs

@@ -624,6 +624,14 @@ pub fn wallet_command(
 			&global_wallet_args,
 			wallet_config.dark_background_color_scheme.unwrap_or(true),
 		),
+		("payments", Some(_)) => {
+			info!("payments command received");
+			command::payments(
+				inst_wallet(),
+				&global_wallet_args,
+				wallet_config.dark_background_color_scheme.unwrap_or(true),
+			)
+		}
 		("txs", Some(args)) => {
 			let a = arg_parse!(parse_txs_args(&args));
 			command::txs(

src/bin/cmd/wallet_tests.rs

@@ -501,6 +501,10 @@ mod wallet_tests {
 		let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "outputs"];
 		execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
 
+		// payments
+		let arg_vec = vec!["grin-wallet", "-p", "password", "-a", "mining", "payments"];
+		execute_command(&app, test_dir, "wallet1", &client1, arg_vec)?;
+
 		// let logging finish
 		thread::sleep(Duration::from_millis(200));
 		Ok(())

src/bin/grin-wallet.yml

@@ -163,7 +163,9 @@ subcommands:
             short: f
             long: fluff
   - outputs:
-      about: Raw wallet output info (list of outputs)
+      about: Raw wallet self owned output info (list of outputs)
+  - payments:
+      about: Raw wallet payment output info (list of outputs)
   - txs:
       about: Display transaction information
       args: