mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge pull request #4439 from PastaPastaPasta/backport-15809
Backport 15809, 15802, 15792, 15913
This commit is contained in:
commit
80cf7424b5
4
.gitignore
vendored
4
.gitignore
vendored
@ -69,6 +69,7 @@ libconftest.dylib*
|
|||||||
*.a
|
*.a
|
||||||
*.pb.cc
|
*.pb.cc
|
||||||
*.pb.h
|
*.pb.h
|
||||||
|
*.dat
|
||||||
|
|
||||||
*.log
|
*.log
|
||||||
*.trs
|
*.trs
|
||||||
@ -146,3 +147,6 @@ make
|
|||||||
# CLion
|
# CLion
|
||||||
.idea
|
.idea
|
||||||
cmake-build-debug
|
cmake-build-debug
|
||||||
|
|
||||||
|
# clang-check
|
||||||
|
*.plist
|
||||||
|
@ -53,6 +53,8 @@ Dash Core is now available at `./src/dashd`
|
|||||||
|
|
||||||
Before running, you may create an empty configuration file:
|
Before running, you may create an empty configuration file:
|
||||||
|
|
||||||
|
mkdir -p "/Users/${USER}/Library/Application Support/DashCore"
|
||||||
|
|
||||||
touch "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
|
touch "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
|
||||||
|
|
||||||
chmod 600 "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
|
chmod 600 "/Users/${USER}/Library/Application Support/DashCore/dash.conf"
|
||||||
|
@ -19,7 +19,7 @@ outgoing connections, but more is possible.
|
|||||||
|
|
||||||
-onion=ip:port Set the proxy server to use for Tor hidden services. You do not
|
-onion=ip:port Set the proxy server to use for Tor hidden services. You do not
|
||||||
need to set this if it's the same as -proxy. You can use -noonion
|
need to set this if it's the same as -proxy. You can use -noonion
|
||||||
to explicitly disable access to hidden service.
|
to explicitly disable access to hidden services.
|
||||||
|
|
||||||
-listen When using -proxy, listening is disabled by default. If you want
|
-listen When using -proxy, listening is disabled by default. If you want
|
||||||
to run a hidden service (see next section), you'll need to enable
|
to run a hidden service (see next section), you'll need to enable
|
||||||
@ -30,12 +30,15 @@ outgoing connections, but more is possible.
|
|||||||
-seednode=X SOCKS5. In Tor mode, such addresses can also be exchanged with
|
-seednode=X SOCKS5. In Tor mode, such addresses can also be exchanged with
|
||||||
other P2P nodes.
|
other P2P nodes.
|
||||||
|
|
||||||
-onlynet=tor Only connect to .onion nodes and drop IPv4/6 connections.
|
-onlynet=onion Make outgoing connections only to .onion addresses. Incoming
|
||||||
|
connections are not affected by this option. This option can be
|
||||||
|
specified multiple times to allow multiple network types, e.g.
|
||||||
|
ipv4, ipv6, or onion.
|
||||||
|
|
||||||
An example how to start the client if the Tor proxy is running on local host on
|
An example how to start the client if the Tor proxy is running on local host on
|
||||||
port 9050 and only allows .onion nodes to connect:
|
port 9050 and only allows .onion nodes to connect:
|
||||||
|
|
||||||
./dashd -onion=127.0.0.1:9050 -onlynet=tor -listen=0 -addnode=ssapp53tmftyjmjb.onion
|
./dashd -onion=127.0.0.1:9050 -onlynet=onion -listen=0 -addnode=ssapp53tmftyjmjb.onion
|
||||||
|
|
||||||
In a typical situation, this suffices to run behind a Tor proxy:
|
In a typical situation, this suffices to run behind a Tor proxy:
|
||||||
|
|
||||||
|
@ -33,17 +33,49 @@ public:
|
|||||||
|
|
||||||
void DummyWalletInit::AddWalletOptions() const
|
void DummyWalletInit::AddWalletOptions() const
|
||||||
{
|
{
|
||||||
std::vector<std::string> opts = {"-createwalletbackups=<n>", "-disablewallet", "-instantsendnotify=<cmd>",
|
gArgs.AddHiddenArgs({
|
||||||
"-keypool=<n>", "-rescan=<mode>", "-salvagewallet", "-spendzeroconfchange", "-upgradewallet",
|
"-avoidpartialspends",
|
||||||
"-wallet=<path>", "-walletbackupsdir=<dir>", "-walletbroadcast", "-walletdir=<dir>",
|
"-createwalletbackups=<n>",
|
||||||
"-walletnotify=<cmd>", "-zapwallettxes=<mode>", "-discardfee=<amt>", "-fallbackfee=<amt>",
|
"-disablewallet",
|
||||||
"-mintxfee=<amt>", "-paytxfee=<amt>", "-txconfirmtarget=<n>", "-hdseed=<hex>", "-mnemonic=<text>",
|
"-instantsendnotify=<cmd>",
|
||||||
"-mnemonicpassphrase=<text>", "-usehd", "-keepass", "-keepassid=<id>", "-keepasskey=<key>",
|
"-keypool=<n>",
|
||||||
"-keepassname=<name>", "-keepassport=<port>", "-enablecoinjoin", "-coinjoinamount=<n>",
|
"-rescan=<mode>",
|
||||||
"-coinjoinautostart", "-coinjoindenomsgoal=<n>", "-coinjoindenomshardcap=<n>", "-coinjoinmultisession",
|
"-salvagewallet",
|
||||||
"-coinjoinrounds=<n>", "-coinjoinsessions=<n>", "-dblogsize=<n>", "-flushwallet", "-privdb",
|
"-spendzeroconfchange",
|
||||||
"-walletrejectlongchains"};
|
"-upgradewallet",
|
||||||
gArgs.AddHiddenArgs(opts);
|
"-wallet=<path>",
|
||||||
|
"-walletbackupsdir=<dir>",
|
||||||
|
"-walletbroadcast",
|
||||||
|
"-walletdir=<dir>",
|
||||||
|
"-walletnotify=<cmd>",
|
||||||
|
"-zapwallettxes=<mode>",
|
||||||
|
"-discardfee=<amt>",
|
||||||
|
"-fallbackfee=<amt>",
|
||||||
|
"-mintxfee=<amt>",
|
||||||
|
"-paytxfee=<amt>",
|
||||||
|
"-txconfirmtarget=<n>",
|
||||||
|
"-hdseed=<hex>",
|
||||||
|
"-mnemonic=<text>",
|
||||||
|
"-mnemonicpassphrase=<text>",
|
||||||
|
"-usehd",
|
||||||
|
"-keepass",
|
||||||
|
"-keepassid=<id>",
|
||||||
|
"-keepasskey=<key>",
|
||||||
|
"-keepassname=<name>",
|
||||||
|
"-keepassport=<port>",
|
||||||
|
"-enablecoinjoin",
|
||||||
|
"-coinjoinamount=<n>",
|
||||||
|
"-coinjoinautostart",
|
||||||
|
"-coinjoindenomsgoal=<n>",
|
||||||
|
"-coinjoindenomshardcap=<n>",
|
||||||
|
"-coinjoinmultisession",
|
||||||
|
"-coinjoinrounds=<n>",
|
||||||
|
"-coinjoinsessions=<n>",
|
||||||
|
"-dblogsize=<n>",
|
||||||
|
"-flushwallet",
|
||||||
|
"-privdb",
|
||||||
|
"-walletrejectlongchains"
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();
|
const WalletInitInterface& g_wallet_init_interface = DummyWalletInit();
|
||||||
|
Loading…
Reference in New Issue
Block a user