Merge remote-tracking branch 'qortal/master'

# Conflicts:
#	.gitignore
#	pom.xml
#	src/main/java/org/qortal/controller/Controller.java
#	src/main/java/org/qortal/gui/SysTray.java
#	src/main/java/org/qortal/settings/Settings.java
#	src/main/resources/i18n/ApiError_en.properties
#	src/test/java/org/qortal/test/CryptoTests.java
#	src/test/resources/test-settings-v2.json

src/test/resources/test-settings-v2-bitcoin-regtest.json

@@ -1,9 +1,13 @@
 {
+  "repositoryPath": "testdb",
   "bitcoinNet": "REGTEST",
   "litecoinNet": "REGTEST",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-block-archive.json

@@ -0,0 +1,13 @@
+{
+  "bitcoinNet": "TEST3",
+  "litecoinNet": "TEST3",
+  "restrictedApi": false,
+  "blockchainConfig": "src/test/resources/test-chain-v2.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
+  "wipeUnconfirmedOnStart": false,
+  "testNtpOffset": 0,
+  "minPeers": 0,
+  "pruneBlockLimit": 100,
+  "repositoryPath": "dbtest"
+}

src/test/resources/test-settings-v2-founder-rewards.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-founder-rewards.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-leftover-reward.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-leftover-reward.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-minting.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-minting.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-qora-holder-extremes.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-qora-holder-extremes.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-qora-holder.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-qora-holder.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-reward-levels.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-reward-levels.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2-reward-scaling.json

@@ -1,7 +1,11 @@
 {
+  "repositoryPath": "testdb",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2-reward-scaling.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
-  "minPeers": 0
+  "minPeers": 0,
+  "pruneBlockLimit": 100
 }

src/test/resources/test-settings-v2.json

@@ -1,10 +1,15 @@
 {
+  "repositoryPath": "testdb",
   "bitcoinNet": "TEST3",
   "litecoinNet": "TEST3",
   "restrictedApi": false,
   "blockchainConfig": "src/test/resources/test-chain-v2.json",
+  "exportPath": "qortal-backup-test",
+  "bootstrap": false,
   "wipeUnconfirmedOnStart": false,
   "testNtpOffset": 0,
   "minPeers": 0,
+  "pruneBlockLimit": 100,
+  "bootstrapFilenamePrefix": "test-",
   "dataPath": "data-test"
 }