diff --git a/.gitignore b/.gitignore index d5dc205578..1f27e7c76a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,7 @@ build *.java.hsw *.~ava /bundles -/bisq-* +/haveno-* /lib /xchange desktop.ini diff --git a/Makefile b/Makefile index 33da5878e6..08a52d722a 100644 --- a/Makefile +++ b/Makefile @@ -35,13 +35,13 @@ # the various Bisq seed and desktop nodes that will make up your # localnet: # -# $ ls -1 bisq-* -# bisq-desktop -# bisq-monitor -# bisq-pricenode -# bisq-relay -# bisq-seednode -# bisq-statsnode +# $ ls -1 haveno-* +# haveno-desktop +# haveno-monitor +# haveno-pricenode +# haveno-relay +# haveno-seednode +# haveno-statsnode # # - You will see a new '.localnet' directory containing the data dirs # for your regtest Bitcoin and Bisq nodes. Once you've deployed them in @@ -189,7 +189,7 @@ bitcoind: .localnet -blocknotify='.localnet/bitcoind/blocknotify %s' seednode: seednode/build - ./bisq-seednode \ + ./haveno-seednode \ --baseCurrencyNetwork=XMR_STAGENET \ --useLocalhostForP2P=true \ --useDevPrivilegeKeys=true \ @@ -202,7 +202,7 @@ seednode: seednode/build --appName=seednode seednode2: seednode/build - ./bisq-seednode \ + ./haveno-seednode \ --baseCurrencyNetwork=XMR_STAGENET \ --useLocalhostForP2P=true \ --useDevPrivilegeKeys=true \ @@ -215,7 +215,7 @@ seednode2: seednode/build --appName=seednode2 mediator: desktop/build - ./bisq-desktop \ + ./haveno-desktop \ --baseCurrencyNetwork=XMR_STAGENET \ --useLocalhostForP2P=true \ --useDevPrivilegeKeys=true \ @@ -224,7 +224,7 @@ mediator: desktop/build --appName=Mediator alice: setup - ./bisq-desktop \ + ./haveno-desktop \ --baseCurrencyNetwork=XMR_STAGENET \ --useLocalhostForP2P=true \ --useDevPrivilegeKeys=true \ @@ -239,7 +239,7 @@ alice: setup --appName=Alice bob: setup - ./bisq-desktop \ + ./haveno-desktop \ --baseCurrencyNetwork=XMR_STAGENET \ --useLocalhostForP2P=true \ --useDevPrivilegeKeys=true \ diff --git a/README.md b/README.md index 01ad982294..3ae3d4baa7 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,10 @@ See the [FAQ in the wiki](https://github.com/haveno-dex/haveno/wiki/FAQ). 11. `cd haveno` 12. `./gradlew build` 13. Start seed node, arbitrator, Alice, and Bob: - 1. `./bisq-seednode --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-XMR_STAGENET_Seed_2002 --daoActivated=false` - 2. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=4444 --appName=bisq-XMR_STAGENET_arbitrator --daoActivated=false --apiPassword=apitest --apiPort=9998` - 3. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=5555 --appName=bisq-XMR_STAGENET_Alice --daoActivated=false --apiPassword=apitest --apiPort=9999` - 4. `./bisq-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=6666 --appName=bisq-XMR_STAGENET_Bob --daoActivated=false --apiPassword=apitest --apiPort=10000` + 1. `./haveno-seednode --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=2002 --appName=bisq-XMR_STAGENET_Seed_2002 --daoActivated=false` + 2. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=4444 --appName=bisq-XMR_STAGENET_arbitrator --daoActivated=false --apiPassword=apitest --apiPort=9998` + 3. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=5555 --appName=bisq-XMR_STAGENET_Alice --daoActivated=false --apiPassword=apitest --apiPort=9999` + 4. `./haveno-desktop --baseCurrencyNetwork=XMR_STAGENET --useLocalhostForP2P=true --useDevPrivilegeKeys=true --nodePort=6666 --appName=bisq-XMR_STAGENET_Bob --daoActivated=false --apiPassword=apitest --apiPort=10000` 14. Arbitrator window > Account > cmd+n to register a new arbitrator 15. Arbitrator window > Account > cmd+d to register a new mediator 16. Deposit stagenet XMR to Alice and Bob's Haveno wallets (wallet address printed to terminal) @@ -113,4 +113,4 @@ To bring Haveno to life, we need resources. If you have the possibility, please ![Qr code](https://raw.githubusercontent.com/haveno-dex/haveno/master/media/qrhaveno.png) -If you are using a wallet that supports Openalias (like the 'official' CLI and GUI wallets), you can simply put `donations@haveno.network` as the "receiver" address. \ No newline at end of file +If you are using a wallet that supports Openalias (like the 'official' CLI and GUI wallets), you can simply put `donations@haveno.network` as the "receiver" address. diff --git a/build.gradle b/build.gradle index 3ca4709805..6c12c1a0d7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,10 @@ buildscript { } configure(rootProject) { - // remove the 'bisq-*' scripts and 'lib' dir generated by the 'installDist' task + // remove the 'haveno-*' scripts and 'lib' dir generated by the 'installDist' task task clean { doLast { - delete fileTree(dir: rootProject.projectDir, include: 'bisq-*'), 'lib' + delete fileTree(dir: rootProject.projectDir, include: 'haveno-*'), 'lib' } } } @@ -111,14 +111,14 @@ configure([project(':cli'), installDist.destinationDir = file('build/app') distZip.enabled = false - // the 'installDist' and 'startScripts' blocks below configure bisq executables to put + // the 'installDist' and 'startScripts' blocks below configure haveno executables to put // generated shell scripts in the root project directory, such that users can easily - // discover and invoke e.g. ./bisq-desktop, ./bisq-seednode, etc. + // discover and invoke e.g. ./haveno-desktop, ./haveno-seednode, etc. // See https://stackoverflow.com/q/46327736 for details. installDist { doLast { - // copy generated shell scripts, e.g. `bisq-desktop` directly to the project + // copy generated shell scripts, e.g. `haveno-desktop` directly to the project // root directory for discoverability and ease of use copy { @@ -134,16 +134,16 @@ configure([project(':cli'), // edit generated shell scripts such that they expect to be executed in the // project root dir as opposed to a 'bin' subdirectory - def windowsScriptFile = file("${rootProject.projectDir}/bisq-${applicationName}.bat") + def windowsScriptFile = file("${rootProject.projectDir}/haveno-${applicationName}.bat") windowsScriptFile.text = windowsScriptFile.text.replace( 'set APP_HOME=%DIRNAME%..', 'set APP_HOME=%DIRNAME%') - def unixScriptFile = file("${rootProject.projectDir}/bisq-$applicationName") + def unixScriptFile = file("${rootProject.projectDir}/haveno-$applicationName") unixScriptFile.text = unixScriptFile.text.replace( 'cd "`dirname \\"$PRG\\"`/.." >/dev/null', 'cd "`dirname \\"$PRG\\"`" >/dev/null') if (applicationName == 'desktop') { - def script = file("${rootProject.projectDir}/bisq-$applicationName") + def script = file("${rootProject.projectDir}/haveno-$applicationName") script.text = script.text.replace( 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=4g"') } @@ -152,22 +152,22 @@ configure([project(':cli'), // Pass the logback config file as a system property to avoid chatty // logback startup due to multiple logback.xml files in the classpath // (:daemon & :cli). - def script = file("${rootProject.projectDir}/bisq-$applicationName") + def script = file("${rootProject.projectDir}/haveno-$applicationName") script.text = script.text.replace( 'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="' + '-Dlogback.configurationFile=apitest/build/resources/main/logback.xml"') } if (osdetector.os != 'windows') - delete fileTree(dir: rootProject.projectDir, include: 'bisq-*.bat') + delete fileTree(dir: rootProject.projectDir, include: 'haveno-*.bat') else - delete fileTree(dir: rootProject.projectDir, include: 'bisq-*', exclude: '*.bat') + delete fileTree(dir: rootProject.projectDir, include: 'haveno-*', exclude: '*.bat') } } startScripts { - // rename scripts from, e.g. `desktop` to `bisq-desktop` - applicationName = "bisq-$applicationName" + // rename scripts from, e.g. `desktop` to `haveno-desktop` + applicationName = "haveno-$applicationName" } }