mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-11-21 06:34:16 +01:00
Proof of Payment Command Line (#260)
* refactor address generation code into libwallet, bool to flag whether to include proof, add sender address in init_send_tx * rustfmt * require payment proof addr as part of init_tx * rustfmt * store payment proof on sender transaction side * rustfmt * change sig to ed25519 sig * rustfmt * add message creation and signature * rustfmt * add payment proof verification function * rustfmt * validate proof on sender side, store proof * rustfmt * fix json tests * fixes and updates to tests * added API functions for converting and retrieving proof addresses * rustfmt * add payment proof to init_send_tx example * rustfmt * incorrect comment * add commands for requesting payment proofs * rustfmt * wire up payment proofs into command line * rustfmt * add address command * rustfmt * added tor sending from owner api * rustfmt
This commit is contained in:
@@ -132,6 +132,15 @@ subcommands:
|
||||
short: d
|
||||
long: dest
|
||||
takes_value: true
|
||||
- request_payment_proof:
|
||||
help: Request a payment proof from the recipient. If sending to a tor address, the address will be filled automatically.
|
||||
short: y
|
||||
long: request_payment_proof
|
||||
- proof_address:
|
||||
help: Recipient proof address. If not using TOR, must be provided seprarately by the recipient
|
||||
short: z
|
||||
long: proof_address
|
||||
takes_value: true
|
||||
- fluff:
|
||||
help: Fluff the transaction (ignore Dandelion relay protocol)
|
||||
short: f
|
||||
@@ -345,6 +354,8 @@ subcommands:
|
||||
short: d
|
||||
long: display
|
||||
takes_value: false
|
||||
- address:
|
||||
about: Display the wallet's payment proof address
|
||||
- scan:
|
||||
about: Checks a wallet's outputs against a live node, repairing and restoring missing outputs if required
|
||||
args:
|
||||
|
||||
+28
-6
@@ -15,7 +15,7 @@
|
||||
use crate::api::TLSConfig;
|
||||
use crate::config::GRIN_WALLET_DIR;
|
||||
use crate::util::file::get_first_line;
|
||||
use crate::util::{Mutex, ZeroingString};
|
||||
use crate::util::{to_hex, Mutex, ZeroingString};
|
||||
/// Argument parsing and error handling for wallet commands
|
||||
use clap::ArgMatches;
|
||||
use failure::Fail;
|
||||
@@ -26,7 +26,9 @@ use grin_wallet_impls::tor::config::is_tor_address;
|
||||
use grin_wallet_impls::{DefaultLCProvider, DefaultWalletImpl};
|
||||
use grin_wallet_impls::{PathToSlate, SlateGetter as _};
|
||||
use grin_wallet_libwallet::Slate;
|
||||
use grin_wallet_libwallet::{IssueInvoiceTxArgs, NodeClient, WalletInst, WalletLCProvider};
|
||||
use grin_wallet_libwallet::{
|
||||
address, IssueInvoiceTxArgs, NodeClient, WalletInst, WalletLCProvider,
|
||||
};
|
||||
use grin_wallet_util::grin_core as core;
|
||||
use grin_wallet_util::grin_core::core::amount_to_hr_string;
|
||||
use grin_wallet_util::grin_core::global;
|
||||
@@ -520,6 +522,20 @@ pub fn parse_send_args(args: &ArgMatches) -> Result<command::SendArgs, ParseErro
|
||||
}
|
||||
};
|
||||
|
||||
let payment_proof_address = {
|
||||
match args.is_present("request_payment_proof") {
|
||||
true => {
|
||||
// if the destination address is a TOR address, we don't need the address
|
||||
// separately
|
||||
match address::pubkey_from_onion_v3(&dest) {
|
||||
Ok(k) => Some(to_hex(k.to_bytes().to_vec())),
|
||||
Err(_) => Some(parse_required(args, "proof_address")?.to_owned()),
|
||||
}
|
||||
}
|
||||
false => None,
|
||||
}
|
||||
};
|
||||
|
||||
Ok(command::SendArgs {
|
||||
amount: amount,
|
||||
message: message,
|
||||
@@ -531,6 +547,7 @@ pub fn parse_send_args(args: &ArgMatches) -> Result<command::SendArgs, ParseErro
|
||||
change_outputs: change_outputs,
|
||||
fluff: fluff,
|
||||
max_outputs: max_outputs,
|
||||
payment_proof_address,
|
||||
target_slate_version: target_slate_version,
|
||||
})
|
||||
}
|
||||
@@ -964,11 +981,15 @@ where
|
||||
let mut g = global_wallet_args.clone();
|
||||
g.tls_conf = None;
|
||||
arg_parse!(parse_owner_api_args(&mut c, &args));
|
||||
command::owner_api(wallet, keychain_mask, &c, &g)
|
||||
}
|
||||
("web", Some(_)) => {
|
||||
command::owner_api(wallet, keychain_mask, &wallet_config, &global_wallet_args)
|
||||
command::owner_api(wallet, keychain_mask, &c, &tor_config, &g)
|
||||
}
|
||||
("web", Some(_)) => command::owner_api(
|
||||
wallet,
|
||||
keychain_mask,
|
||||
&wallet_config,
|
||||
&tor_config,
|
||||
&global_wallet_args,
|
||||
),
|
||||
("account", Some(args)) => {
|
||||
let a = arg_parse!(parse_account_args(&args));
|
||||
command::account(wallet, km, a)
|
||||
@@ -1043,6 +1064,7 @@ where
|
||||
let a = arg_parse!(parse_cancel_args(&args));
|
||||
command::cancel(wallet, km, a)
|
||||
}
|
||||
("address", Some(_)) => command::address(wallet, &global_wallet_args, km),
|
||||
("scan", Some(args)) => {
|
||||
let a = arg_parse!(parse_check_args(&args));
|
||||
command::scan(wallet, km, a)
|
||||
|
||||
Reference in New Issue
Block a user