mirror of
https://github.com/jwinterm/grin-wallet.git
synced 2026-10-17 15:21:39 +02:00
Optional Tor Send/Listen Functionality (#226)
* udpate for beta release * initial tor explorations * rustfmt * basic tor tx send working * rustfmt * add tor proxy info to config file * rustfmt * add utilities to output tor hidden service configuration files * output tor config as part of listener startup * rustfmt * fully automate config and startup of tor process * rustfmt * remove unnecessary process kill commands from listener * rustfmt * assume defaults for tor sending config if section doesn't exist in grin-wallet.toml * rustfmt * ignore tor dev test * update default paths output by config, compilation + confirmed working on windows * rustfmt * fix on osx/unix * add timeout to tor connector, remove unwrap in client * allow specifiying tor address without 'http://[].onion' on the command line * fix api test * rustfmt * update address derivation path as per spec * rustfmt * move tor init to separate function * rustfmt * re-ignore tor dev test * listen on tor by default if tor available * rustfmt * test fix * remove explicit send via tor flag, and assume tor if address fits * rustfmt
This commit is contained in:
@@ -213,6 +213,14 @@ pub enum ErrorKind {
|
||||
#[fail(display = "Supplied Keychain Mask Token is incorrect")]
|
||||
InvalidKeychainMask,
|
||||
|
||||
/// Tor Process error
|
||||
#[fail(display = "Tor Process Error: {}", _0)]
|
||||
TorProcess(String),
|
||||
|
||||
/// Tor Configuration Error
|
||||
#[fail(display = "Tor Config Error: {}", _0)]
|
||||
TorConfig(String),
|
||||
|
||||
/// Other
|
||||
#[fail(display = "Generic error: {}", _0)]
|
||||
GenericError(String),
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
//! Types and traits that should be provided by a wallet
|
||||
//! implementation
|
||||
|
||||
use crate::config::WalletConfig;
|
||||
use crate::config::{TorConfig, WalletConfig};
|
||||
use crate::error::{Error, ErrorKind};
|
||||
use crate::grin_core::core::hash::Hash;
|
||||
use crate::grin_core::core::{Output, Transaction, TxKernel};
|
||||
@@ -66,6 +66,7 @@ where
|
||||
file_name: &str,
|
||||
wallet_config: Option<WalletConfig>,
|
||||
logging_config: Option<LoggingConfig>,
|
||||
tor_config: Option<TorConfig>,
|
||||
) -> Result<(), Error>;
|
||||
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user