diff --git a/README.md b/README.md index ff9e6bc18..5eccea652 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Portions Copyright (c) 2012-2013 The Cryptonote developers. ### Blockchain Explorers - https://explore.wownero.com -- http://wow5eqtzqvsg5jctqzg5g7uk3u62sfqiacj5x6lo4by7bvnj6jkvubyd.onion +- http://gffjxd5nn2heslj6jv5ts2ok5j6xi6m3pwlpz7le4i5bu56sirbxfiqd.onion:8081 - https://wownero.club - https://explorer.wownero.fyi @@ -170,10 +170,10 @@ To run in background: To run as a systemd service, copy [wownerod.service](utils/systemd/wownerod.service) to `/etc/systemd/system/` and -[wownerod.conf](utils/conf/wownerod.conf) to `/etc/`. The [example +[wownerod.conf](wownerod.conf) to `/etc/`. The [example service](utils/systemd/wownerod.service) assumes that the user `wownero` exists and its home is the data directory specified in the [example -config](utils/conf/wownerod.conf). +config](wownerod.conf). Once node is synced to network, run the CLI wallet by entering: @@ -183,26 +183,37 @@ Type `help` in CLI wallet to see standard commands (for advanced options, type ` ## Tor Anonymity Network -* Install [Tor Browser](https://www.torproject.org/download/) -* Open `torrc` file in a text editor ([installation directory]/Browser/TorBrowser/Data/Tor/torrc) and add hidden service information as follows: +### Ubuntu +* `sudo apt-get update && sudo apt-get install tor -y` +* `sudo nano /etc/tor/torrc` + +add the following: ``` -HiddenServiceDir [installation directory]/Browser/TorBrowser/Data/Tor/wow_node +HiddenServiceDir /var/lib/tor/wownero/ +HiddenServicePort 34568 127.0.0.1:34568 +HiddenServicePort 34566 127.0.0.1:34566 HiddenServiceVersion 3 -HiddenServicePort 44568 127.0.0.1:44568 ``` -* Save `torrc` file and restart Tor Browser (keep open) -* Change directory to the `wow_node` folder, open `hostname` file, and copy your node's ".onion" address -* Start wownerod with the following parameters: +save and close nano + +* `sudo /etc/init.d/tor restart && sudo systemctl enable tor` +* copy [wownerod.conf](https://git.wownero.com/wownero/wownero/raw/branch/master/wownerod.conf) file and save it in same directory as `wownerod`. +* start wownerod like this: ``` -./wownerod --tx-proxy tor,127.0.0.1:9150,10 --add-peer hdps3qwnusz64r7odvynmae6myc2uyvrsc2emap6636qeuzll72eouid.onion:44568 --anonymous-inbound YOUR_NODE_ADDRESS.onion:44568,127.0.0.1:44568,25 +./wownerod --config-file=wownerod.conf ``` +* `sudo cat /var/lib/tor/wownero/hostname` +copy your onion address and share node with others [here](https://monero.fail/?crypto=wownero) and [here](https://forum.wownero.com/t/wownero-tor-onion-sites/623) + +To share your node over p2p, uncomment first line of wownerod.conf and add your onion address. + +More information on running Tor and i2p nodes is available [here](https://forum.wownero.com/t/how-to-setup-a-full-node-with-tor-i2p/588) + ### Access remote Tor node from CLI wallet ``` -./wownero-wallet-cli --proxy 127.0.0.1:9150 --daemon-address wow7dhbgiljnkspkzpjyy66auegbrye2ptfv4gucgbhireg5rrjza5ad.onion:34568 +./wownero-wallet-cli --proxy 127.0.0.1:9050 --daemon-address iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34568 ``` - -Use port `9050` instead of `9150` if you installed Tor as a standalone daemon. For more information, check out [ANONYMITY_NETWORKS](https://git.wownero.com/wownero/wownero/src/branch/master/ANONYMITY_NETWORKS.md). diff --git a/contrib/tor/wownero-over-tor.sh b/contrib/tor/wownero-over-tor.sh index ee8223d91..940f1af36 100755 --- a/contrib/tor/wownero-over-tor.sh +++ b/contrib/tor/wownero-over-tor.sh @@ -42,7 +42,9 @@ CookieAuthentication 1 CookieAuthFile $TORDIR/control.authcookie CookieAuthFileGroupReadable 1 HiddenServiceDir $TORDIR -HiddenServicePort 38083 127.0.0.1:38083 +HiddenServicePort 34568 127.0.0.1:34568 +HiddenServicePort 34566 127.0.0.1:34566 +HiddenServiceVersion 3 EOF echo "Starting Tor..." @@ -67,9 +69,15 @@ fi echo "Starting wownerod..." HOSTNAME=$(cat "$HOSTNAMEFILE") "$monerod" \ - --anonymous-inbound "$HOSTNAME":38083,127.0.0.1:38083,25 --tx-proxy tor,127.0.0.1:9050,10 \ - --add-priority-node zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:38083 \ - --add-priority-node 2xmrnode5itf65lz.onion:38083 \ + --anonymous-inbound "$HOSTNAME":34566,127.0.0.1:34566,25 --tx-proxy tor,127.0.0.1:9050,10 \ + --add-priority-node v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34568 \ + --add-priority-node iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34568 \ + --add-priority-node 7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34568 \ + --add-priority-node j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34568 \ + --add-priority-node aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34568 \ + --add-priority-node nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34568 \ + --add-priority-node 666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34568 \ + --add-priority-node ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34568 \ --detach ready=0 for i in `seq 10` diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 09670f86c..ca559a650 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -821,9 +821,14 @@ namespace nodetool if (m_nettype == cryptonote::MAINNET) { return { - "xwvz3ekocr3dkyxfkmgm2hvbpzx2ysqmaxgter7znnqrhoicygkfswid.onion:18083", - "4pixvbejrvihnkxmduo2agsnmc3rrulrqc7s3cbwwrep6h6hrzsibeqd.onion:18083", - "zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:18083", + "v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34566", + "iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34566", + "7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34566", + "j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34566", + "aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34566", + "nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34566", + "666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34566", + "ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34566", }; } return {}; @@ -831,8 +836,6 @@ namespace nodetool if (m_nettype == cryptonote::MAINNET) { return { - "s3l6ke4ed3df466khuebb4poienoingwof7oxtbo6j4n56sghe3a.b32.i2p:18080", - "sel36x6fibfzujwvt4hf5gxolz6kd3jpvbjqg6o3ud2xtionyl2q.b32.i2p:18080" }; } return {}; diff --git a/utils/conf/wownerod.conf b/utils/conf/wownerod.conf deleted file mode 100644 index 1db5ef55d..000000000 --- a/utils/conf/wownerod.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Configuration for wownerod -# Syntax: any command line option may be specified as 'clioptionname=value'. -# Boolean options such as 'no-igd' are specified as 'no-igd=1'. -# See 'wownerod --help' for all available options. - -data-dir=/var/lib/wownero -log-file=/var/log/wownero/wownero.log -log-level=0 diff --git a/utils/systemd/wownerod.service b/utils/systemd/wownerod.service index 26fd36443..d1488e0a6 100644 --- a/utils/systemd/wownerod.service +++ b/utils/systemd/wownerod.service @@ -1,38 +1,17 @@ [Unit] Description=Wownero Full Node -After=network.target +After=network-online.target +Wants=network-online.target [Service] User=wownero Group=wownero -WorkingDirectory=~ -RuntimeDirectory=wownero +Environment="MONERO_RANDOMX_UMASK=1" StateDirectory=wownero LogsDirectory=wownero - -# Clearnet config -# -Type=forking -PIDFile=/run/wownero/wownerod.pid -ExecStart=/usr/bin/wownerod --config-file /etc/wownerod.conf \ - --detach --pidfile /run/wownero/wownerod.pid - -# Tor config -# -## We have to use simple, not forking, because we cannot pass --detach -## because stderr/stdout is not available when detached, but torsocks -## attempts to write to it, and fails with 'invalid argument', causing -## wownerod to fail. -#Type=simple -#Environment=DNS_PUBLIC=tcp -## The following is needed only when accessing wallet from a different -## host in the LAN, VPN, etc, the RPC must bind to 0.0.0.0, but -## by default torsocks only allows binding to localhost. -#Environment=TORSOCKS_ALLOW_INBOUND=1 -#ExecStart=/usr/bin/torsocks /usr/bin/wownerod --config-file /etc/wownerod.conf \ -# --non-interactive - +Type=simple +ExecStart=/usr/local/bin/wownerod --config-file /etc/wownerod.conf --non-interactive Restart=always [Install] -WantedBy=multi-user.target +WantedBy=multi-user.target \ No newline at end of file diff --git a/wownerod.conf b/wownerod.conf new file mode 100644 index 000000000..b5cef5512 --- /dev/null +++ b/wownerod.conf @@ -0,0 +1,28 @@ +#anonymous-inbound=YOUR_ONION_ADDRESS:34566,127.0.0.1:34566,64 +check-updates=disabled +log-level=0 +no-igd=1 +no-zmq=1 +restricted-rpc=1 +p2p-bind-ip=0.0.0.0 +p2p-bind-port=34567 +public-node=1 +confirm-external-bind=1 +rpc-bind-ip=0.0.0.0 +rpc-bind-port=34568 +rpc-ssl=autodetect +disable-rpc-ban=1 +db-sync-mode=safe +out-peers=64 +in-peers=64 +limit-rate-up=1048576 +limit-rate-down=1048576 +tx-proxy=tor,127.0.0.1:9050,23 +add-priority-node=v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34568 +add-priority-node=iy6ry6uudpzvbd72zsipepukp6nsazjdu72n52vg3isfnxqn342flzad.onion:34568 +add-priority-node=7ftpbpp6rbgqi5kjmhyin46essnh3eqb3m3rhfi7r2fr33iwkeuer3yd.onion:34568 +add-priority-node=j7rf2jcccizcp47y5moehguyuqdpg4lusk642sw4nayuruitqaqbc7ad.onion:34568 +add-priority-node=aje53o5z5twne5q2ljw44zkahhsuhjtwaxuburxddbf7n4pfsj4rj6qd.onion:34568 +add-priority-node=nepc4lxndsooj2akn7ofrj3ooqc25242obchcag6tw3f2mxrms2uuvyd.onion:34568 +add-priority-node=666l2ajxqjgj5lskvbokvworjysgvqag4oitokjuy7wz6juisul4jqad.onion:34568 +add-priority-node=ty7ppqozzodz75audgvkprekiiqsovbyrkfdjwadrkbe3etyzloatxad.onion:34568 \ No newline at end of file