diff --git a/Makefile b/Makefile index 5dba898588..0e60920ae1 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,7 @@ monerod1-local: --log-level 0 \ --add-exclusive-node 127.0.0.1:48080 \ --add-exclusive-node 127.0.0.1:58080 \ + --max-connections-per-ip 10 \ --rpc-access-control-origins http://localhost:8080 \ --fixed-difficulty 500 \ --disable-rpc-ban \ @@ -88,6 +89,7 @@ monerod2-local: --confirm-external-bind \ --add-exclusive-node 127.0.0.1:28080 \ --add-exclusive-node 127.0.0.1:58080 \ + --max-connections-per-ip 10 \ --rpc-access-control-origins http://localhost:8080 \ --fixed-difficulty 500 \ --disable-rpc-ban \ @@ -106,6 +108,7 @@ monerod3-local: --confirm-external-bind \ --add-exclusive-node 127.0.0.1:28080 \ --add-exclusive-node 127.0.0.1:48080 \ + --max-connections-per-ip 10 \ --rpc-access-control-origins http://localhost:8080 \ --fixed-difficulty 500 \ --disable-rpc-ban \ diff --git a/README.md b/README.md index 5c439f9a55..5b1d7e3db6 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Haveno can be installed on Linux, macOS, and Windows by using a third party inst A test network is also available for users to make test trades using Monero's stagenet. See the [instructions](https://github.com/haveno-dex/haveno/blob/master/docs/installing.md) to build Haveno and connect to the test network. -Alternatively, you can [create your own mainnet network](create-mainnet.md). +Alternatively, you can [create your own mainnet network](https://github.com/haveno-dex/haveno/blob/master/docs/create-mainnet.md). Note that Haveno is being actively developed. If you find issues or bugs, please let us know. @@ -63,7 +63,7 @@ See the [developer guide](docs/developer-guide.md) to get started developing for See [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md) for our styling guides. -If you are not able to contribute code and want to contribute development resources, [donations](#support) fund development bounties. +If you are not able to contribute code and want to contribute development resources, [donations](#support-and-sponsorships) fund development bounties. ## Bounties diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java index 0592fbdd59..95669e9e0b 100644 --- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java +++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java @@ -247,7 +247,11 @@ public class XmrWalletService extends XmrWalletBase { @Override public void saveWallet() { - saveWallet(!(Utilities.isWindows() && wallet != null)); + saveWallet(shouldBackup(wallet)); + } + + private boolean shouldBackup(MoneroWallet wallet) { + return wallet != null && !Utilities.isWindows(); // TODO: cannot backup on windows because file is locked } public void saveWallet(boolean backup) { @@ -389,7 +393,7 @@ public class XmrWalletService extends XmrWalletBase { MoneroError err = null; String path = wallet.getPath(); try { - if (save) saveWallet(wallet, true); + if (save) saveWallet(wallet, shouldBackup(wallet)); wallet.close(); } catch (MoneroError e) { err = e; diff --git a/docs/developer-guide.md b/docs/developer-guide.md index 565ee4886e..dd799a9a9e 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -8,7 +8,7 @@ This document is a guide for Haveno development. ## Run the UI proof of concept -Follow [instructions](https://github.com/haveno-dex/haveno-ts#run-in-a-browser) to run Haveno's UI proof of concept in a browser. +Follow [instructions](https://github.com/haveno-dex/haveno-ui-poc) to run Haveno's UI proof of concept in a browser. This proof of concept demonstrates using Haveno's gRPC server with a web frontend (react and typescript) instead of Haveno's JFX application.